X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb17fe41eeefff2ba60d28c2d3866fa8e07fc2f9..1cff61deed401f43f03aafb14531771c89b1df93:/setup/maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 3b46d09403..e6f902ccef 100644
--- a/setup/maketmpl.in
+++ b/setup/maketmpl.in
@@ -31,12 +31,13 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
 
 # c-compiler stuff
 CC = @CC@
-CFLAGS = @CFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
 CPP = @CPP@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 
 # c++-compiler stuff
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
+CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 CXXCPP = @CXXCPP@
 
 # shared compile stuff
@@ -83,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@
@@ -97,6 +100,7 @@ $(TOOLKIT_DEF) \
 -I.. \
 -I$(WXBASEDIR)/include \
 -I$(WXBASEDIR)/src/zlib \
+-I$(WXBASEDIR)/src/iodbc \
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)
@@ -105,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)