wxPaintDC -> wxDC in wxListCtrl; fixed compile problems in wxTreeCtrl (return

[wxWidgets.git] / setup / maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 9c6592865d2cb2c0adbf68a06787dad5989198b2..e6f902ccefecebcde28959f4530e4affd8230c75 100644 (file)
--- 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,11 +109,11 @@ $(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)
 
-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl
+GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) @DL_LIBRARY@
 
 LINK = $(CXX) -o $@
 LINK_LIBS= \