diff options
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/config.mak | 20 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile index 61ba490..1ef8771 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,11 @@ -.PHONY: do_all cd_freetype cd cdx11 cdgdk cd_pdflib cdpdf cdgl cdcontextplus cdcairo cdlua3 cdluapdf3 cdluagl3 cdlua5 cdluapdf5 cdluagl5 cdluacontextplus5 cdluacairo5 cdluaim5 -do_all: cd_freetype cd cd_pdflib cdpdf cdgl cdlua5 cdluapdf5 cdluagl5 cdluaim5 +.PHONY: do_all cd_freetype cd_ftgl cd cdx11 cdgdk cd_pdflib cdpdf cdgl cdcontextplus cdcairo cdlua3 cdluapdf3 cdluagl3 cdlua5 cdluapdf5 cdluagl5 cdluacontextplus5 cdluacairo5 cdluaim5 +do_all: cd_freetype cd_ftgl cd cd_pdflib cdpdf cdgl cdlua5 cdluapdf5 cdluagl5 cdluaim5 cd_freetype: @$(MAKE) --no-print-directory -f tecmake.mak MF=cd_freetype +cd_ftgl: + @$(MAKE) --no-print-directory -f tecmake.mak MF=cd_ftgl cd: @$(MAKE) --no-print-directory -f tecmake.mak cdx11: diff --git a/src/config.mak b/src/config.mak index 467f4f5..2a37a2a 100644 --- a/src/config.mak +++ b/src/config.mak @@ -81,18 +81,22 @@ ifdef USE_GDK ifdef ADD_CAIRO SRC += cairo/cdcairoprn_unix.c endif - INCLUDES += /usr/include/gtk-unix-print-2.0 + INCLUDES += $(GTK_BASE)/include/gtk-unix-print-2.0 endif LIBS += freetype endif else -ifdef USE_X11 - SRC += $(SRCX11) $(SRCNULL) - LIBS = freetype -else - SRC += $(SRCWIN32) - LIBS = freetype6 -endif + ifdef USE_X11 + SRC += $(SRCX11) $(SRCNULL) + LIBS = freetype + else + SRC += $(SRCWIN32) + ifneq ($(findstring cygw, $(TEC_UNAME)), ) + LIBS = freetype-6 + else + LIBS = freetype6 + endif + endif endif ifneq ($(findstring dll, $(TEC_UNAME)), ) |