From 43e754eca017deb8e3d2e38abf95732b13500b7f Mon Sep 17 00:00:00 2001 From: scuri Date: Wed, 19 Jan 2011 16:29:40 +0000 Subject: *** empty log message *** --- tecmake.mak | 9 +++++++-- tecmakewin.mak | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tecmake.mak b/tecmake.mak index 3f8c0ab..d8c18bc 100644 --- a/tecmake.mak +++ b/tecmake.mak @@ -240,6 +240,11 @@ ifndef NO_GTK_DEFAULT ifneq ($(findstring FreeBSD, $(TEC_UNAME)), ) GTK_DEFAULT = Yes endif + ifneq ($(findstring SunOS, $(TEC_UNAME)), ) + ifeq ($(TEC_SYSARCH), x86) + GTK_DEFAULT = Yes + endif + endif endif #---------------------------------# @@ -947,7 +952,7 @@ endif ifdef USE_GTK ifdef USE_PKGCONFIG # get compile/link flags via pkg-config - PKGINCS += $(shell pkg-config --cflags gtk+-2.0 gdk-2.0) + PKGINCS += $(shell pkg-config --cflags gtk+-2.0 gdk-2.0 gtk+-unix-print-2.0) PKGLIBS += $(shell pkg-config --libs gtk+-2.0 gdk-2.0) GTK_BASE := $(shell pkg-config --variable=prefix gtk+-2.0) GTK := $(GTK_BASE) @@ -984,7 +989,7 @@ ifdef USE_GTK endif LIBS += gdk_pixbuf-2.0 pango-1.0 gobject-2.0 gmodule-2.0 glib-2.0 - STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 + STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/gdk-pixbuf-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 ifeq ($(TEC_SYSARCH), x64) STDINCS += $(GTK)/lib64/glib-2.0/include $(GTK)/lib64/gtk-2.0/include diff --git a/tecmakewin.mak b/tecmakewin.mak index 4e87c3c..89e3ede 100644 --- a/tecmakewin.mak +++ b/tecmakewin.mak @@ -984,7 +984,7 @@ ifdef USE_OPENGL endif ifdef USE_GTK - STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include $(GTK)/lib/gtk-2.0/include + STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/gdk-pixbuf-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include $(GTK)/lib/gtk-2.0/include ifeq "$(TEC_CC)" "gcc" STDFLAGS += -mms-bitfields endif -- cgit v1.2.3