diff options
| author | scuri <scuri> | 2011-05-25 19:36:36 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2011-05-25 19:36:36 +0000 |
| commit | 37ca31ef29944fe35bf0bc90128e1d69a704a402 (patch) | |
| tree | 1fc61ee99e9ec43a1b36590a8442b0ec608b7987 | |
| parent | 613e1fe61d22cf7093224f31be8db8802fde7047 (diff) | |
*** empty log message ***
| -rw-r--r-- | tecmake.mak | 41 | ||||
| -rw-r--r-- | tecmakewin.mak | 12 |
2 files changed, 39 insertions, 14 deletions
diff --git a/tecmake.mak b/tecmake.mak index 8d00102..2716528 100644 --- a/tecmake.mak +++ b/tecmake.mak @@ -6,7 +6,7 @@ #---------------------------------# # Tecmake Version -VERSION = 4.4 +VERSION = 4.5 #---------------------------------# @@ -486,7 +486,9 @@ endif ifneq ($(findstring IRIX, $(TEC_UNAME)), ) UNIX_POSIX = Yes - LD = ld + ifndef NO_LOCAL_LD + LD = ld + endif STDLDFLAGS := -elf -shared -rdata_shared -soname lib$(TARGETNAME).so RANLIB := /bin/true X11_LIBS := Xmu Xt X11 @@ -533,7 +535,9 @@ endif ifneq ($(findstring SunOS, $(TEC_UNAME)), ) UNIX_POSIX = Yes - LD = ld + ifndef NO_LOCAL_LD + LD = ld + endif STDLDFLAGS := -G X11_INC := /usr/openwin/share/include X11_LIB := /usr/openwin/lib @@ -550,6 +554,15 @@ ifneq ($(findstring SunOS, $(TEC_UNAME)), ) LINKER += -xarch=v9 endif endif + ifdef USE_CC + ifdef DBG + STDFLAGS += -g + else + ifdef OPT +# STDFLAGS += ???? + endif + endif + endif endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) @@ -653,12 +666,16 @@ ifdef USE_LUA52 NO_LUALIB := Yes endif +ifdef USE_IUP + override USE_IUP3 = Yes +endif ifdef USE_IUP3 override USE_IUP = Yes -# Inside Tecgraf only - ifndef IUP3_BUILD -# IUP := $(IUP)3 - endif +endif + +ifdef USE_IUP2 + override USE_IUP = Yes + IUP := $(IUP)2 endif ifdef USE_IUPBETA @@ -869,9 +886,6 @@ ifdef USE_CD else ifneq ($(findstring cygw, $(TEC_UNAME)), ) SLIB += $(CD_LIB)/libfreetype-6.a - else - # Use freetype from the system - LIBS += freetype endif endif else @@ -992,17 +1006,22 @@ 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/gdk-pixbuf-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 + STDINCS += $(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 # Add also these to avoid errors in systems that lib64 does not exists STDINCS += $(GTK)/lib/glib-2.0/include $(GTK)/lib/gtk-2.0/include + # Add also support for newer instalations + STDINCS += $(GTK)/lib/x86_64-linux-gnu/glib-2.0/include else ifeq ($(TEC_SYSARCH), ia64) STDINCS += $(GTK)/lib64/glib-2.0/include $(GTK)/lib64/gtk-2.0/include else STDINCS += $(GTK)/lib/glib-2.0/include $(GTK)/lib/gtk-2.0/include + # Add also support for newer instalations + STDINCS += $(GTK)/lib/i386-linux-gnu/glib-2.0/include endif endif ifneq ($(findstring FreeBSD, $(TEC_UNAME)), ) diff --git a/tecmakewin.mak b/tecmakewin.mak index 89e3ede..1b1deaf 100644 --- a/tecmakewin.mak +++ b/tecmakewin.mak @@ -6,7 +6,7 @@ #---------------------------------# # Tecmake Version -VERSION = 4.4 +VERSION = 4.5 #---------------------------------# @@ -829,10 +829,16 @@ ifdef USE_LUA52 NO_LUALIB := Yes endif +ifdef USE_IUP + override USE_IUP3 = Yes +endif ifdef USE_IUP3 override USE_IUP = Yes -# Inside Tecgraf only -# IUP := $(IUP)3 +endif + +ifdef USE_IUP2 + override USE_IUP = Yes + IUP := $(IUP)2 endif ifdef USE_IUPBETA |