From 7d5d5d8c77f6047113d762017fd829bd668f5b5e Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 15 Jun 2010 15:17:47 +0200 Subject: Rearrange in Makerules and Makethird to remove cyclical dependencies. --- Makerules | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index 80aa17f7..d111ce30 100644 --- a/Makerules +++ b/Makerules @@ -3,12 +3,11 @@ OS := $(shell uname) OS := $(OS:MINGW%=MINGW) -LIBS := -lfreetype -ljbig2dec -lopenjpeg -ljpeg -lz -lm -CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf -LDFLAGS = -CC = cc -LD = $(CC) -AR = ar +CFLAGS := -Wall -Ifitz -Imupdf +LDFLAGS := +CC := cc +LD := $(CC) +AR := ar ifeq "$(build)" "debug" CFLAGS += -g -O0 @@ -19,36 +18,38 @@ CFLAGS += -O3 endif ifeq "$(OS)" "Linux" -ifeq "$(freetype_dir)" "" -CFLAGS += `pkg-config --cflags freetype2` -LDFLAGS += `pkg-config --libs freetype2` -endif -X11LIBS = -lX11 -lXext +SYS_FREETYPE_INC := `pkg-config --cflags freetype2` +SYS_FREETYPE_LIB := `pkg-config --libs freetype2` + +X11LIBS := -lX11 -lXext PDFVIEW_EXE = $(X11VIEW_EXE) + ifeq "$(build)" "release" CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86 ARCH_SRC = archx86.c endif + endif ifeq "$(OS)" "Darwin" -CFLAGS += -I$(HOME)/include -I/usr/X11R6/include -LDFLAGS += -L$(HOME)/lib -L/usr/X11R6/lib -ifeq "$(freetype_dir)" "" -CFLAGS += -I/usr/X11R6/include/freetype2 -endif -X11LIBS = -lX11 -lXext +SYS_FREETYPE_INC := -I/usr/X11R6/include/freetype2 +CFLAGS += -I/usr/X11R6/include +LDFLAGS += -L/usr/X11R6/lib + +X11LIBS := -lX11 -lXext PDFVIEW_EXE = $(X11VIEW_EXE) + ifeq "$(build)" "release" CFLAGS += -DARCH_X86_64 -ARCH_SRC = archx86.c +ARCH_SRC := archx86.c endif + endif # MinGW build depends on thirdparty ifeq "$(OS)" "MINGW" CC = gcc -W32LIBS = -lgdi32 -lcomdlg32 -luser32 -ladvapi32 -lshell32 -mwindows +W32LIBS := -lgdi32 -lcomdlg32 -luser32 -ladvapi32 -lshell32 -mwindows PDFVIEW_EXE = $(WINVIEW_EXE) endif -- cgit v1.2.3