regrouped the fix by VZ so that __MWERKS__ comes first, since CW also defines _MSC_VE...

[wxWidgets.git] / setup / maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 1c9a405bfbccc24a4bf565caf855a689450e624d..e6f902ccefecebcde28959f4530e4affd8230c75 100644 (file)
--- a/setup/maketmpl.in
+++ b/setup/maketmpl.in
@@ -84,6 +84,8 @@ GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
 GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
 GUI_TK_LINK = @GUI_TK_LINK@
 
+WX_LINK = @WX_LINK@
+
 OPENGL_INCLUDE = @OPENGL_INCLUDE@
 OPENGL_LIBRARY = @OPENGL_LIBRARY@
 OPENGL_LINK = @OPENGL_LINK@
@@ -98,6 +100,7 @@ $(TOOLKIT_DEF) \
 -I.. \
 -I$(WXBASEDIR)/include \
 -I$(WXBASEDIR)/src/zlib \
+-I$(WXBASEDIR)/src/iodbc \
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)
@@ -106,7 +109,7 @@ $(X_CFLAGS)
 # -I$(WXBASEDIR)/src/zlib \
 # -I$(WXBASEDIR)/src/gdk_imlib \
 
-WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
+WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
 
 OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)