* prgodlgg.h: Update() use wxString instead of 'char *'

[wxWidgets.git] / setup / maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 9526467f1b6e3cd830531e15edf382aebec847a8..a97349e8a5f55f13b77ef4ec86ed08f5b4715da4 100644 (file)
--- a/setup/maketmpl.in
+++ b/setup/maketmpl.in
@@ -33,11 +33,11 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
 CC = @CC@
 CPP = @CPP@
 CPPFLAGS=@CPPFLAGS@
-CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) -D_REENTRANT
+CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 
 # c++-compiler stuff
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) -D_REENTRANT
+CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 CXXCPP = @CXXCPP@
 
 # shared compile stuff
@@ -55,7 +55,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 AWK = @AWK@
 LN_S = @LN_S@
-CJPEG_PROG = 
+STRIP = @STRIP@
+CJPEG_PROG =
 CONVERT_PATH = /usr/bin/X11
 CONVERT_PROG = /usr/bin/X11/convert
 DJPEG_PROG = 
@@ -88,14 +89,18 @@ WX_LINK = @WX_LINK@
 
 THREADS_LINK = @THREADS_LINK@
 EXTRA_LINK = @EXTRA_LINK@
+JPEG_LINK = @JPEG_LINK@
+POSIX4_LINK=@POSIX4_LINK@
 
 # INCLUDES
 WX_INCLUDES = \
+-I$(WXBASEDIR)/src/zlib \
+-I$(WXBASEDIR)/src/png \
+-I$(WXBASEDIR)/src/jpeg \
 $(TOOLKIT_DEF) \
 -I$(WXBASEDIR)/include \
 -I. \
 $(GUI_TK_INCLUDE) \
--I$(WXBASEDIR)/src/zlib \
 -I$(WXBASEDIR)/src/iodbc \
 $(X_CFLAGS)
 
@@ -110,8 +115,10 @@ LINK_LIBS= \
   $(X_EXTRA_LIBS) \
   $(X_PRE_LIBS) \
   $(THREADS_LINK) \
-  $(EXTRA_LINK)
-  
+  $(POSIX4_LINK) \
+  $(EXTRA_LINK) \
+  $(JPEG_LINK)
+
 # Don't include $(OPENGL_LIBS) in LINK_LIBS; they
 # can be conveniently added to BIN_LINK in Makefile.in.