diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 8 | ||||
-rw-r--r-- | src/config.mak | 26 | ||||
-rw-r--r-- | src/make_uname | 1 | ||||
-rw-r--r-- | src/make_uname.bat | 1 |
4 files changed, 27 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index f01667c..d2f5e0d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,12 +1,14 @@ -.PHONY: do_all cd_freetype cd cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5 -#do_all: cd_freetype cd cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5 -do_all: cd_freetype cd cd_pdflib cdpdf cdcontextplus cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5 +.PHONY: do_all cd_freetype cd cdgdk cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5 +#do_all: cd_freetype cd cdgdk cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5 +do_all: cd_freetype cd cdgdk cd_pdflib cdpdf cdcontextplus cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5 cd_freetype: @$(MAKE) --no-print-directory -f tecmake_compact.mak MF=cd_freetype cd: @$(MAKE) --no-print-directory -f tecmake_compact.mak +cdgdk: + @$(MAKE) --no-print-directory -f tecmake_compact.mak USE_GDK=Yes cd_pdflib: @$(MAKE) --no-print-directory -f tecmake_compact.mak MF=cd_pdflib cdpdf: diff --git a/src/config.mak b/src/config.mak index 725b87d..a2296cb 100644 --- a/src/config.mak +++ b/src/config.mak @@ -12,15 +12,18 @@ SRCINTCGM = circle.c ellipse.c intcgm1.c \ sism.c tparse.c bparse.c SRCINTCGM := $(addprefix intcgm/, $(SRCINTCGM)) -SRCWIN32 = cdwclp.c cdwemf.c cdwimg.c cdwin.c cdwnative.c cdwprn.c cdwwmf.c wmf_emf.c cdwdbuf.c cdwdib.c -SRCWIN32 := $(addprefix win32/, $(SRCWIN32)) - SRCSIM := cdfontex.c sim.c cd_truetype.c sim_other.c sim_primitives.c sim_text.c sim_linepolyfill.c SRCSIM := $(addprefix sim/, $(SRCSIM)) +SRCWIN32 = cdwclp.c cdwemf.c cdwimg.c cdwin.c cdwnative.c cdwprn.c cdwwmf.c wmf_emf.c cdwdbuf.c cdwdib.c +SRCWIN32 := $(addprefix win32/, $(SRCWIN32)) + SRCX11 = cdx11.c cdxclp.c cdximg.c cdxnative.c cdxdbuf.c xvertex.c SRCX11 := $(addprefix x11/, $(SRCX11)) +SRCGDK = cdgdk.c cdgdkclp.c cdgdkdbuf.c cdgdkimg.c cdgdknative.c +SRCGDK := $(addprefix gdk/, $(SRCGDK)) + SRCDRV = cddgn.c cdcgm.c cgm.c cddxf.c cdirgb.c cdmf.c cdps.c cdpicture.c cddebug.c SRCDRV := $(addprefix drv/, $(SRCDRV)) @@ -33,11 +36,22 @@ SRCCOMM = cd.c wd.c wdhdcpy.c rgb2map.c cd_vectortext.c cd_active.c \ SRC = $(SRCCOMM) $(SRCSVG) $(SRCINTCGM) $(SRCDRV) $(SRCSIM) ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - SRC += $(SRCWIN32) + ifdef USE_GDK + SRC += $(SRCGDK) + LIBNAME = cdgdk + else + SRC += $(SRCWIN32) + endif LIBS = freetype6 else - SRC += $(SRCNULL) $(SRCX11) - USE_X11 = Yes + ifdef USE_GDK + SRC += $(SRCGDK) + LIBNAME = cdgdk + else + SRC += $(SRCX11) + USE_X11 = Yes + endif + SRC += $(SRCNULL) LIBS = freetype endif diff --git a/src/make_uname b/src/make_uname index 6de18ef..8c2f35e 100644 --- a/src/make_uname +++ b/src/make_uname @@ -2,6 +2,7 @@ tecmake $1 MF=cd_freetype $2 $3 $4 $5 $6 $7 $8 tecmake $1 $2 $3 $4 $5 $6 $7 $8 +tecmake $1 USE_GDK=Yes $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cd_pdflib $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cdpdf $2 $3 $4 $5 $6 $7 $8 #tecmake $1 MF=cdlua3 $2 $3 $4 $5 $6 $7 $8 diff --git a/src/make_uname.bat b/src/make_uname.bat index 70c3510..7ac2147 100644 --- a/src/make_uname.bat +++ b/src/make_uname.bat @@ -6,6 +6,7 @@ if "%1"=="vc-all" goto all-vc call tecmake %1 "MF=cd_freetype" %2 %3 %4 %5 %6 %7 %8 call tecmake %1 %2 %3 %4 %5 %6 %7 %8 +call tecmake %1 "USE_GDK=Yes" %1 %2 %3 %4 %5 %6 %7 %8 call tecmake %1 "MF=cd_pdflib" %2 %3 %4 %5 %6 %7 %8 call tecmake %1 "MF=cdpdf" %2 %3 %4 %5 %6 %7 %8 REM call tecmake %1 "MF=cdlua3" %2 %3 %4 %5 %6 %7 %8 |