diff options
| author | scuri <scuri> | 2010-11-12 00:40:04 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2010-11-12 00:40:04 +0000 |
| commit | 1d720a28c6b3ba7d66efbc5ae72ed7bf60e0ac78 (patch) | |
| tree | c7363e95c099aa6ed42de5f989b318bead69f75c | |
| parent | 324769ed96e0f952fb23fe36e8660e6a2e70f2e0 (diff) | |
*** empty log message ***
| -rw-r--r-- | src/cdcairo.mak | 5 | ||||
| -rw-r--r-- | src/cdluacairo5.mak | 2 | ||||
| -rw-r--r-- | src/cdluacontextplus5.mak | 2 | ||||
| -rw-r--r-- | src/cdluagl5.mak | 2 | ||||
| -rw-r--r-- | src/cdluaim5.mak | 4 | ||||
| -rw-r--r-- | src/cdluapdf5.mak | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/src/cdcairo.mak b/src/cdcairo.mak index ccb393d..3ecfea9 100644 --- a/src/cdcairo.mak +++ b/src/cdcairo.mak @@ -19,12 +19,15 @@ else DEFINES += CAIRO_X11 CHECK_GTK = Yes + USE_X11 = Yes + ifdef GTK_DEFAULT CD_SUFFIX := x11 endif endif -INCLUDES += $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include +# Can NOT use USE_GTK because gtk will be included for linking +INCLUDES += $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include $(GTK)/lib64/glib-2.0/include LDIR = $(GTK)/lib LIBS = pangocairo-1.0 cairo pango-1.0 gobject-2.0 glib-2.0 diff --git a/src/cdluacairo5.mak b/src/cdluacairo5.mak index 7ed4c14..ef3f9f8 100644 --- a/src/cdluacairo5.mak +++ b/src/cdluacairo5.mak @@ -34,11 +34,11 @@ else endif NO_LUALINK = Yes -USE_CD = YES USE_CDLUA = YES CD = .. ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CD = YES USE_CDLUA:= INCLUDES += ../include LDIR = ../lib/$(TEC_UNAME) diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak index a94fae0..66760fc 100644 --- a/src/cdluacontextplus5.mak +++ b/src/cdluacontextplus5.mak @@ -28,11 +28,11 @@ else endif NO_LUALINK = Yes -USE_CD = YES USE_CDLUA = YES CD = .. ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CD = YES USE_CDLUA:= INCLUDES += ../include LDIR = ../lib/$(TEC_UNAME) diff --git a/src/cdluagl5.mak b/src/cdluagl5.mak index 51e635b..dcef357 100644 --- a/src/cdluagl5.mak +++ b/src/cdluagl5.mak @@ -18,11 +18,11 @@ else endif NO_LUALINK = Yes -USE_CD = YES USE_CDLUA = YES CD = .. ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CD = YES USE_CDLUA:= INCLUDES += ../include LDIR = ../lib/$(TEC_UNAME) diff --git a/src/cdluaim5.mak b/src/cdluaim5.mak index 506eded..9c39f27 100644 --- a/src/cdluaim5.mak +++ b/src/cdluaim5.mak @@ -14,14 +14,14 @@ else LIBNAME := $(LIBNAME)51 endif -USE_CD = YES USE_CDLUA = YES -USE_IM = YES USE_IMLUA = YES NO_LUALINK = Yes CD = .. ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_IM = YES + USE_CD = YES USE_IMLUA:= USE_CDLUA:= INCLUDES += ../include $(IM)/include diff --git a/src/cdluapdf5.mak b/src/cdluapdf5.mak index 94e807e..ee325c5 100644 --- a/src/cdluapdf5.mak +++ b/src/cdluapdf5.mak @@ -18,11 +18,11 @@ else endif NO_LUALINK = Yes -USE_CD = YES USE_CDLUA = YES CD = .. ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CD = YES USE_CDLUA:= INCLUDES += ../include LDIR = ../lib/$(TEC_UNAME) |