Upgrading to iup 3.1

1 files changed, 34 insertions, 17 deletions

diff --git a/iup/srcconsole/config.mak b/iup/srcconsole/config.mak
index 612a3ab..568bed6 100755
--- a/iup/srcconsole/config.mak
+++ b/iup/srcconsole/config.mak
@@ -1,12 +1,23 @@
 PROJNAME = iup
 APPNAME = iuplua51
-APPTYPE = console
+APPTYPE = CONSOLE
+
+ifdef GTK_DEFAULT
+  ifdef USE_MOTIF
+    # Build Motif version in Linux,Darwin,FreeBSD
+    APPNAME = iuplua51mot
+  endif
+else  
+  ifdef USE_GTK
+    # Build GTK version in IRIX,SunOS,AIX,Win32
+    APPNAME = iuplua51gtk
+  endif
+endif
 
 LOHDIR = loh
 SRCLUA = console5.lua
 SRC = iup_lua51.c
 
-
 # Disable strip
 STRIP = 
 # Optimize
@@ -35,6 +46,16 @@ ifdef DBG
   USE_STATIC = Yes
   USE_LUA51 = Yes
   
+  ifdef DBG_DIR
+    IUPLIB = $(IUP)/lib/$(TEC_UNAME)d
+    CDLIB = $(CD)/lib/$(TEC_UNAME)d
+    IMLIB = $(IM)/lib/$(TEC_UNAME)d
+  else
+    IUPLIB = $(IUP)/lib/$(TEC_UNAME)
+    CDLIB = $(CD)/lib/$(TEC_UNAME)
+    IMLIB = $(IM)/lib/$(TEC_UNAME)
+  endif  
+  
   DEFINES = USE_STATIC
 
     USE_CDLUA = Yes
@@ -42,7 +63,6 @@ ifdef DBG
     ifneq ($(findstring Win, $(TEC_SYSNAME)), )
       LIBS += iuplua_pplot$(LIBLUASUFX) iup_pplot
     else
-      IUPLIB = $(IUP)/lib/$(TEC_UNAME)
       SLIB += $(IUPLIB)/libiuplua_pplot$(LIBLUASUFX).a $(IUPLIB)/libiup_pplot.a
     endif
       
@@ -50,7 +70,6 @@ ifdef DBG
       ifneq ($(findstring Win, $(TEC_SYSNAME)), )
         LIBS += cdluaim$(LIBLUASUFX)
       else
-        CDLIB = $(CD)/lib/$(TEC_UNAME)
         SLIB += $(CDLIB)/libcdluaim$(LIBLUASUFX).a
       endif
     endif
@@ -65,8 +84,6 @@ ifdef DBG
     ifneq ($(findstring Win, $(TEC_SYSNAME)), )
       LIBS += imlua_process$(LIBLUASUFX) iupluaim$(LIBLUASUFX) im_process iupim
     else
-      IUPLIB = $(IUP)/lib/$(TEC_UNAME)
-      IMLIB = $(IM)/lib/$(TEC_UNAME)
       SLIB +=  $(IMLIB)/libimlua_process$(LIBLUASUFX).a $(IUPLIB)/libiupluaim$(LIBLUASUFX).a $(IMLIB)/libim_process.a $(IUPLIB)/libiupim.a
     endif
     
@@ -77,20 +94,24 @@ ifdef DBG
     ifneq ($(findstring Win, $(TEC_SYSNAME)), )
       LIBS += iupluaimglib$(LIBLUASUFX) iupimglib
     else
-      IUPLIB = $(IUP)/lib/$(TEC_UNAME)
       SLIB += $(IUPLIB)/libiupluaimglib$(LIBLUASUFX).a $(IUPLIB)/libiupimglib.a
     endif
   endif
 else
   ifneq ($(findstring Win, $(TEC_SYSNAME)), )
     # Dinamically link in Windows, when not debugging
-    # Must call "tecmake dll8"
+    # Must call "tecmake dll8" so USE_* will use the correct TEC_UNAME
     USE_LUA51 = Yes
     USE_DLL = Yes
     GEN_MANIFEST = No
   else
     # In UNIX Lua is always statically linked, late binding is used.
-    USE_STATIC = Yes
+    # Except in Cygwin and MacOSX
+    ifeq ($(findstring cygw, $(TEC_UNAME)), )
+      ifeq ($(findstring Darwin, $(TEC_UNAME)), )
+        USE_STATIC = Yes
+      endif
+    endif
     USE_LUA51 = Yes
   endif
 endif
@@ -102,10 +123,13 @@ ifneq ($(findstring Win, $(TEC_SYSNAME)), )
 endif
 
 ifneq ($(findstring cygw, $(TEC_UNAME)), )
-  LDFLAGS = -s
   LIBS += readline history
 endif
 
+ifneq ($(findstring Darwin, $(TEC_UNAME)), )
+  LIBS += readline
+endif
+
 ifneq ($(findstring Linux, $(TEC_UNAME)), )
   LIBS += dl 
   #To allow late binding
@@ -129,10 +153,3 @@ ifneq ($(findstring AIX, $(TEC_UNAME)), )
   LFLAGS = -Xlinker "-bbigtoc"
 endif
 
-ifeq ($(TEC_UNAME), vc8)
-  ifdef DBG
-    #debug info not working for vc8 linker
-    define DBG
-    endef
-  endif
-endif