From e47790b44bf8580ba48aad3313e1c64d791b7025 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Wed, 27 Jan 2010 02:27:20 +0000
Subject: *** empty log message ***

---
 src/tecmake_compact.mak | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/tecmake_compact.mak')

diff --git a/src/tecmake_compact.mak b/src/tecmake_compact.mak
index e6ce627..e0fe0ee 100644
--- a/src/tecmake_compact.mak
+++ b/src/tecmake_compact.mak
@@ -193,7 +193,6 @@ RANLIB   := $(TEC_TOOLCHAIN)ranlib
 AR       := $(TEC_TOOLCHAIN)ar
 DEBUGGER := $(TEC_TOOLCHAIN)gdb
 RCC      := $(TEC_TOOLCHAIN)windres 
-LD       := $(TEC_TOOLCHAIN)gcc
 
 
 #---------------------------------#
@@ -306,8 +305,10 @@ TARGETDIR := $(TARGETROOT)/$(TEC_UNAME_DIR)
 ifndef LINKER
   ifneq "$(findstring .cpp, $(SRC))" ""
     LINKER := $(CPPC)
+    LD := $(CPPC)
   else
     LINKER := $(CC)
+    LD := $(CC)
   endif
 endif
 
@@ -631,8 +632,13 @@ ifdef USE_LUA
       LIBS += lualib$(LUASUFX)
     endif
     ifndef NO_LUALINK
-      LIBS += lua$(LUASUFX)
-      LDIR += $(LUA_LIB)
+        LIBS += lua$(LUASUFX)
+        LDIR += $(LUA_LIB)
+    else
+      ifneq ($(findstring cygw, $(TEC_UNAME)), )
+        LIBS += lua$(LUASUFX)
+        LDIR += $(LUA_LIB)
+      endif
     endif
   endif
   
@@ -771,7 +777,9 @@ endif
 ifdef USE_OPENGL
   override USE_X11 = Yes
   ifdef USE_MOTIF
-    LIBS += $(MOTIFGL_LIB)
+    ifndef USE_IUP3
+      LIBS += $(MOTIFGL_LIB)
+    endif
   endif
   LIBS += $(OPENGL_LIBS)
   LDIR += $(OPENGL_LIB)
-- 
cgit v1.2.3