From d16f00afbbac707bba729eb3874fac4c52273a91 Mon Sep 17 00:00:00 2001 From: scuri Date: Wed, 16 Dec 2009 13:20:08 +0000 Subject: *** empty log message *** --- src/config.mak | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'src/config.mak') 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 -- cgit v1.2.3