diff options
| author | scuri <scuri> | 2010-10-13 22:29:55 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2010-10-13 22:29:55 +0000 |
| commit | 6620df9471268a72f0c58eddb99c0d612bca566e (patch) | |
| tree | c932b63ddb2d8295b136c7ace7e8e2e6bad4fe41 /src | |
| parent | eef7ae01a9757f5e4a0693d539ee1fac5b09e756 (diff) | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/cdcairo.mak | 4 | ||||
| -rw-r--r-- | src/cdcontextplus.mak | 4 | ||||
| -rw-r--r-- | src/cdluacontextplus5.mak | 10 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/cdcairo.mak b/src/cdcairo.mak index 9b1b171..ccb393d 100644 --- a/src/cdcairo.mak +++ b/src/cdcairo.mak @@ -18,6 +18,10 @@ else SRC += cdcaironative_x11.c DEFINES += CAIRO_X11 CHECK_GTK = 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 diff --git a/src/cdcontextplus.mak b/src/cdcontextplus.mak index e612452..7e11bba 100644 --- a/src/cdcontextplus.mak +++ b/src/cdcontextplus.mak @@ -18,6 +18,10 @@ else LIBS = Xrender Xft USE_X11 = Yes CHECK_XRENDER = Yes + + ifdef GTK_DEFAULT + CD_SUFFIX := x11 + endif INCLUDES = . sim drv freetype2 x11 endif diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak index eee24f0..a94fae0 100644 --- a/src/cdluacontextplus5.mak +++ b/src/cdluacontextplus5.mak @@ -10,12 +10,16 @@ DEF_FILE = cdluacontextplus5.def ifneq ($(findstring Win, $(TEC_SYSNAME)), ) CHECK_GDIPLUS = Yes + LIBS = cdcontextplus else - CHECK_XRENDER = Yes + ifdef GTK_DEFAULT + CHECK_GTK = Yes + else + CHECK_XRENDER = Yes + LIBS = cdcontextplus + endif endif -LIBS = cdcontextplus - ifdef USE_LUA52 LIBNAME := $(LIBNAME)52 else |