From 0a8141bef5d589962a8147e1ab5e4193ac017639 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Mon, 22 Nov 2010 20:38:08 +0000
Subject: *** empty log message ***

---
 html/en/building.html | 61 ++++++++++++++++++++++++----------------
 tecmake.mak           | 78 +++++++++++++++++++++++++++++++++------------------
 tecmakewin.mak        | 47 +++++++++++++++++++++++--------
 3 files changed, 124 insertions(+), 62 deletions(-)

diff --git a/html/en/building.html b/html/en/building.html
index 4c4b564..39114bb 100644
--- a/html/en/building.html
+++ b/html/en/building.html
@@ -59,20 +59,32 @@ cd xxxx
 
 [copy the downloaded files, to the xxxx directory]
 
-tar -xpvzf iup-3.2_Sources.tar.gz
-tar -xpvzf cd-5.4_Sources.tar.gz
+tar -xpvzf lua5_1_4_Sources.tar.gz    [optional, see note bellow]
 tar -xpvzf im-3.6.2_Sources.tar.gz
-tar -xpvzf lua5_1_4_Sources.tar.gz    [optional, see note bellow]</pre>
+tar -xpvzf cd-5.4_Sources.tar.gz
+tar -xpvzf iup-3.2_Sources.tar.gz
+</pre>
 <p>If you are going to build all the libraries, the makefiles and projects 
 expect the following directory tree:</p>
 <pre>/xxxx/
-      cd/
+      lua5.1/    [optional, see note bellow]
       im/
-      iup/
-      lua5.1/    [optional, see note bellow]</pre>
+      cd/
+      iup/</pre>
 
 <p>If you unpack all the source packages in the same directory, that structure will 
 be automatically created.</p>
+<p>If you want to use some of these libraries that are installed on the system 
+(see Installation section bellow) you will have to define some environment 
+variables before building them. For example:</p>
+<pre class="example">export IM_INC=/usr/include/im
+export IM_LIB=/usr/lib           [not necessary, already included by gcc]
+
+export CD_INC=/usr/include/cd
+export CD_LIB=/usr/lib           [not necessary, already included by gcc]
+
+export IUP_INC=/usr/include/iup
+export IUP_LIB=/usr/lib          [not necessary, already included by gcc]</pre>
 <h3>Lua</h3>
 <p>Although we use Lua from LuaBinaries, any Lua installation can also be used. 
 In Ubuntu, the Lua run time package is:</p>
@@ -115,9 +127,9 @@ in <strong>Source Forge</strong>, with <strong>&quot;xxx-X.X_Linux26g4_lib</stro
 and <strong>&quot;xxx-X.X_Linux26g4_64_lib.tar.gz&quot;</strong> names.</p>
 <p>Do not extract different pre-compiled binaries in the same directory, create a 
 subdirectory for each one, for example:</p>
-<pre>mkdir iup
-cd iup
-tar -xpvzf ../iup-3.2_Linux26g4_lib.tar.gz
+<pre>mkdir im
+cd im
+tar -xpvzf ../im-3.6.2_Linux26g4_lib.tar.gz
 cd ..
 
 mkdir cd
@@ -125,11 +137,10 @@ cd cd
 tar -xpvzf ../cd-5.4_Linux26g4_lib.tar.gz
 cd ..
 
-mkdir im
-cd im
-tar -xpvzf ../im-3.6.2_Linux26g4_lib.tar.gz
+mkdir iup
+cd iup
+tar -xpvzf ../iup-3.2_Linux26g4_lib.tar.gz
 cd ..
-
 </pre>
 <p>For the installation instructions bellow, remove the &quot;lib/Linux26g4&quot; from the 
 following examples if you are using the pre-compiled binaries.</p>
@@ -137,23 +148,25 @@ following examples if you are using the pre-compiled binaries.</p>
 
 <p>After building you can copy the libraries files to the system directory. If you are inside 
 the main directory, to install the run time libraries you can type, for example:</p>
-<pre>sudo cp -f iup/lib/Linux26g4/*.so /usr/lib               [script version: <a href="../download/install">install</a> ]
-sudo cp -f cd/lib/Linux26g4/*.so /usr/lib                               
-sudo cp -f im/lib/Linux26g4/*.so /usr/lib</pre>
+<pre>sudo cp -f im/lib/Linux26g4/*.so /usr/lib               [script version: <a href="../download/install">install</a> ]
+sudo cp -f cd/lib/Linux26g4/*.so /usr/lib
+sudo cp -f iup/lib/Linux26g4/*.so /usr/lib
+</pre>
 <p>To install the development files, 
 then do:</p>
-<pre>sudo mkdir -p /usr/include/iup                           [script version: <a href="../download/install_dev">install_dev</a> ]
-sudo cp -f iup/include/*.h /usr/include/iup             
-sudo cp -f iup/lib/Linux26g4/*.a /usr/lib                               
+<pre>sudo mkdir -p /usr/include/im                           [script version: <a href="../download/install_dev">install_dev</a> ]
+sudo cp -fR im/include/*.h /usr/include/im
+sudo cp -f im/lib/Linux26g4/*.a /usr/lib
 
 sudo mkdir -p /usr/include/cd
 sudo cp -f cd/include/*.h /usr/include/cd
 sudo cp -f cd/lib/Linux26g4/*.a /usr/lib
 
-sudo mkdir -p /usr/include/im
-sudo cp -fR im/include/*.h /usr/include/im
-sudo cp -f im/lib/Linux26g4/*.a /usr/lib</pre>
-<p>Then in your makefile use -Iiup -Icd -Iim for includes. There is no need to 
+sudo mkdir -p /usr/include/iup
+sudo cp -f iup/include/*.h /usr/include/iup             
+sudo cp -f iup/lib/Linux26g4/*.a /usr/lib                               
+</pre>
+<p>Then in your makefile use -Iim -Icd -Iiup for includes. There is no need to 
 specify the libraries directory with -L. Development files are only necessary if 
 you are going to compile an application or library in C/C++ that uses there 
 libraries. To just run Lua scripts they are not necessary.</p>
@@ -162,7 +175,7 @@ libraries. To just run Lua scripts they are not necessary.</p>
 directory, you can use them from build directory. You will need to add the run time 
 libraries folders to 
 the LD_LIBRARY_PATH, for example:</p>
-<pre>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/xxxx/iup/lib/Linux26g4:/xxxx/cd/lib/Linux26g4:/xxxx/im/lib/Linux26g4</pre>
+<pre>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/xxxx/im/lib/Linux26g4:/xxxx/cd/lib/Linux26g4:/xxxx/iup/lib/Linux26g4</pre>
 <p>And in your makefile will will also need to specify those paths 
 when linking using -L/xxxx/iup/lib/Linux26g4, and for compiling use 
 -I/xxxx/iup/include.</p>
diff --git a/tecmake.mak b/tecmake.mak
index 8db1745..a588fec 100644
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -6,7 +6,7 @@
 
 #---------------------------------#
 # Tecmake Version
-VERSION = 4.3
+VERSION = 4.4
 
 
 #---------------------------------#
@@ -679,16 +679,19 @@ endif
 ifdef USE_IUPCONTROLS
   override USE_CD = Yes
   override USE_IUP = Yes
+  IUP_LIB ?= $(IUP)/lib/$(TEC_UNAME_LIB_DIR)
+  
   ifdef USE_IUPLUA
     ifdef USE_STATIC
-      SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiupluacontrols$(LIBLUASUFX).a
+      SLIB += $(IUP_LIB)/libiupluacontrols$(LIBLUASUFX).a
     else
       LIBS += iupluacontrols$(LIBLUASUFX)
     endif
     override USE_CDLUA = Yes
   endif
+  
   ifdef USE_STATIC
-    SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiupcontrols.a
+    SLIB += $(IUP_LIB)/libiupcontrols.a
   else
     LIBS += iupcontrols
   endif
@@ -696,8 +699,9 @@ endif
 
 ifdef USE_IMLUA
   override USE_IM = Yes
+  IM_LIB ?= $(IM)/lib/$(TEC_UNAME_LIB_DIR)
   ifdef USE_STATIC
-    SLIB += $(IM)/lib/$(TEC_UNAME_LIB_DIR)/libimlua$(LIBLUASUFX).a
+    SLIB += $(IM_LIB)/libimlua$(LIBLUASUFX).a
   else
     LIBS += imlua$(LIBLUASUFX)
   endif
@@ -705,8 +709,9 @@ endif
 
 ifdef USE_CDLUA
   override USE_CD = Yes
+  CD_LIB ?= $(CD)/lib/$(TEC_UNAME_LIB_DIR)
   ifdef USE_STATIC
-    SLIB += $(CD)/lib/$(TEC_UNAME_LIB_DIR)/libcdlua$(LIBLUASUFX).a
+    SLIB += $(CD_LIB)/libcdlua$(LIBLUASUFX).a
   else
     LIBS += cdlua$(LIBLUASUFX)
   endif
@@ -714,14 +719,16 @@ endif
 
 ifdef USE_IUPLUA
   override USE_IUP = Yes
+  IUP_LIB ?= $(IUP)/lib/$(TEC_UNAME_LIB_DIR)
+  
   ifdef USE_STATIC
     ifdef USE_CD
-      SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiupluacd$(LIBLUASUFX).a
+      SLIB += $(IUP_LIB)/libiupluacd$(LIBLUASUFX).a
     endif
     ifdef USE_OPENGL
-      SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiupluagl$(LIBLUASUFX).a
+      SLIB += $(IUP_LIB)/libiupluagl$(LIBLUASUFX).a
     endif
-    SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiuplua$(LIBLUASUFX).a
+    SLIB += $(IUP_LIB)/libiuplua$(LIBLUASUFX).a
   else
     ifdef USE_CD
       LIBS += iupluacd$(LIBLUASUFX)
@@ -755,13 +762,17 @@ ifdef USE_LUA
     endif
   endif
 
-  LUA_INC   ?= $(LUA)/include
+  LUA_INC ?= $(LUA)/include
   INCLUDES += $(LUA_INC)
 
   LUA_BIN ?= $(LUA)/bin/$(TEC_UNAME)
-  BIN2C     := $(LUA_BIN)/bin2c$(LUA_SUFFIX)
-  LUAC      := $(LUA_BIN)/luac$(LUA_SUFFIX)
-  LUABIN    := $(LUA_BIN)/lua$(LUA_SUFFIX)
+  ifdef USE_BIN2C_LUA
+    BIN2C := $(LUA_BIN)/lua$(LUA_SUFFIX) $(BIN2C_PATH)bin2c.lua
+  else
+    BIN2C := $(LUA_BIN)/bin2c$(LUA_SUFFIX)
+  endif
+  LUAC   := $(LUA_BIN)/luac$(LUA_SUFFIX)
+  LUABIN := $(LUA_BIN)/lua$(LUA_SUFFIX)
 endif
 
 ifdef USE_IUP
@@ -789,14 +800,17 @@ ifdef USE_IUP
       override USE_MOTIF = Yes
     endif
   endif
+  
+  IUP_LIB ?= $(IUP)/lib/$(TEC_UNAME_LIB_DIR)
+
   ifdef USE_STATIC
     ifdef USE_CD
-      SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiupcd.a
+      SLIB += $(IUP_LIB)/libiupcd.a
     endif
     ifdef USE_OPENGL
-      SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiupgl.a
+      SLIB += $(IUP_LIB)/libiupgl.a
     endif
-    SLIB += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)/libiup$(IUP_SUFFIX).a
+    SLIB += $(IUP_LIB)/libiup$(IUP_SUFFIX).a
   else
     ifdef USE_CD
       LIBS += iupcd
@@ -805,9 +819,11 @@ ifdef USE_IUP
       LIBS += iupgl
     endif
     LIBS += iup$(IUP_SUFFIX)
-    LDIR += $(IUP)/lib/$(TEC_UNAME_LIB_DIR)
+    LDIR += $(IUP_LIB)
   endif
-  INCLUDES += $(IUP)/include
+
+  IUP_INC ?= $(IUP)/include
+  INCLUDES += $(IUP_INC)
 endif
 
 ifdef USE_CD
@@ -826,25 +842,28 @@ ifdef USE_CD
       endif
     endif
   endif
+  
+  CD_LIB ?= $(CD)/lib/$(TEC_UNAME_LIB_DIR)
+  
   ifdef USE_STATIC
     ifdef USE_XRENDER
       CHECK_XRENDER = Yes
-      SLIB += $(CD)/lib/$(TEC_UNAME_LIB_DIR)/libcdcontextplus.a
+      SLIB += $(CD_LIB)/libcdcontextplus.a
       LIBS += Xrender Xft
     endif
     ifdef USE_CAIRO
       # To use Cairo with X11 base driver (NOT for GDK)
       # Can NOT be used together with XRender
-      SLIB += $(CD)/lib/$(TEC_UNAME_LIB_DIR)/libcdcairo.a
+      SLIB += $(CD_LIB)/libcdcairo.a
       LIBS += pangocairo-1.0 cairo
     endif
-    SLIB += $(CD)/lib/$(TEC_UNAME_LIB_DIR)/libcd$(CD_SUFFIX).a
+    SLIB += $(CD_LIB)/libcd$(CD_SUFFIX).a
     ifndef USE_GTK
       # Freetype is already included in GTK
-      SLIB += $(CD)/lib/$(TEC_UNAME_LIB_DIR)/libfreetype.a
+      SLIB += $(CD_LIB)/libfreetype.a
     else
       ifneq ($(findstring cygw, $(TEC_UNAME)), )
-        SLIB += $(CD)/lib/$(TEC_UNAME_LIB_DIR)/libfreetype-6.a
+        SLIB += $(CD_LIB)/libfreetype-6.a
       endif
     endif
   else
@@ -860,7 +879,7 @@ ifdef USE_CD
       LIBS += pangocairo-1.0 cairo
     endif
     LIBS += cd$(CD_SUFFIX)
-    LDIR += $(CD)/lib/$(TEC_UNAME_LIB_DIR)
+    LDIR += $(CD_LIB)
     ifndef USE_GTK
       ifndef NO_OVERRIDE
         # Freetype is already included in GTK
@@ -872,17 +891,22 @@ ifdef USE_CD
       endif
     endif
   endif
-  INCLUDES += $(CD)/include
+
+  CD_INC ?= $(CD)/include
+  INCLUDES += $(CD_INC)
 endif
 
 ifdef USE_IM
+  IM_LIB ?= $(IM)/lib/$(TEC_UNAME_LIB_DIR)
   ifdef USE_STATIC
-    SLIB += $(IM)/lib/$(TEC_UNAME_LIB_DIR)/libim.a
+    SLIB += $(IM_LIB)/libim.a
   else
     LIBS += im
-    LDIR += $(IM)/lib/$(TEC_UNAME_LIB_DIR)
+    LDIR += $(IM_LIB)
   endif
-  INCLUDES += $(IM)/include
+
+  IM_INC ?= $(IM)/include
+  INCLUDES += $(IM_INC)
 endif
 
 ifdef USE_GLUT
diff --git a/tecmakewin.mak b/tecmakewin.mak
index 3866fd8..951754a 100644
--- a/tecmakewin.mak
+++ b/tecmakewin.mak
@@ -6,7 +6,7 @@
 
 #---------------------------------#
 # Tecmake Version
-VERSION = 4.3
+VERSION = 4.4
 
 
 #---------------------------------#
@@ -691,6 +691,10 @@ endif
 
 ifeq "$(TEC_CC)" "gcc"
   WIN_OTHER = YES
+  ifdef BUILD64
+    STDDEFS += -DWIN64
+    GTK := $(GTK)_x64
+  endif
   ifneq "$(findstring mingw, $(COMPILER))" ""
     BIN   = $(COMPILER)/bin/
   endif
@@ -894,13 +898,17 @@ ifdef USE_LUA
   LUA_LIB ?= $(LUA)/lib/$(TEC_UNAME)
   LDIR += $(LUA_LIB)
 
-  LUA_INC   ?= $(LUA)/include
+  LUA_INC ?= $(LUA)/include
   INCLUDES += $(LUA_INC)
 
   LUA_BIN ?= $(LUA)/bin/$(TEC_SYSNAME)
-  BIN2C     := $(LUA_BIN)/bin2c$(LUA_SUFFIX)
-  LUAC      := $(LUA_BIN)/luac$(LUA_SUFFIX)
-  LUABIN    := $(LUA_BIN)/lua$(LUA_SUFFIX)
+  ifdef USE_BIN2C_LUA
+    BIN2C := $(LUA_BIN)/lua$(LUA_SUFFIX) $(BIN2C_PATH)bin2c.lua
+  else
+    BIN2C := $(LUA_BIN)/bin2c$(LUA_SUFFIX)
+  endif
+  LUAC   := $(LUA_BIN)/luac$(LUA_SUFFIX)
+  LUABIN := $(LUA_BIN)/lua$(LUA_SUFFIX)
 endif
 
 ifdef USE_IUP
@@ -912,16 +920,22 @@ ifdef USE_IUP
   else
     LIBS += iup
   endif
-  LDIR += $(IUP)/lib/$(TEC_UNAME)
+  
+  IUP_LIB ?= $(IUP)/lib/$(TEC_UNAME)
+  LDIR += $(IUP_LIB)
+  
   ifdef USE_OPENGL
     LIBS += iupgl
   endif
+  
   ifdef USE_DLL
     ifeq ($(MAKETYPE), APP)
       LIBS += iupstub
     endif
   endif
-  INCLUDES += $(IUP)/include
+
+  IUP_INC ?= $(IUP)/include
+  INCLUDES += $(IUP_INC)
 endif
 
 ifdef USE_CD
@@ -929,25 +943,36 @@ ifdef USE_CD
     CHECK_GDIPLUS = Yes
     LIBS += cdcontextplus gdiplus
   endif
+  
   ifdef USE_CAIRO
     # To use Cairo with Win32 base driver (NOT for GDK)
     # Can NOT be used together with GDI+
     LIBS += cdcairo pangocairo-1.0 cairo
   endif
+  
   ifdef USE_GDK
     LIBS += cdgdk
   else
     LIBS += cd
   endif
+  
   LIBS += freetype6
-  LDIR += $(CD)/lib/$(TEC_UNAME)
-  INCLUDES += $(CD)/include
+  
+  CD_LIB ?= $(CD)/lib/$(TEC_UNAME)
+  LDIR += $(CD_LIB)
+
+  CD_INC ?= $(CD)/include
+  INCLUDES += $(CD_INC)
 endif
 
 ifdef USE_IM
   LIBS += im
-  LDIR += $(IM)/lib/$(TEC_UNAME)
-  INCLUDES += $(IM)/include
+  
+  IM_LIB ?= $(IM)/lib/$(TEC_UNAME)
+  LDIR += $(IM_LIB)
+
+  IM_INC ?= $(IM)/include
+  INCLUDES += $(IM_INC)
 endif
 
 ifdef USE_OPENGL
-- 
cgit v1.2.3