Changed .vc makefiles to allow different configurations to co-exist (so library

[wxWidgets.git] / setup / maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index c4f007c35ab2fd7229645da87e1518b83c645fe6..de91877e83c9ada1989c61069b6194ddda7afd5d 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
@@ -86,10 +86,6 @@ GUI_TK_LINK = @GUI_TK_LINK@
 
 WX_LINK = @WX_LINK@
 
-OPENGL_INCLUDE = @OPENGL_INCLUDE@
-OPENGL_LIBRARY = @OPENGL_LIBRARY@
-OPENGL_LINK = @OPENGL_LINK@
-
 THREADS_LINK = @THREADS_LINK@
 EXTRA_LINK = @EXTRA_LINK@
 
@@ -101,13 +97,10 @@ $(TOOLKIT_DEF) \
 $(GUI_TK_INCLUDE) \
 -I$(WXBASEDIR)/src/zlib \
 -I$(WXBASEDIR)/src/iodbc \
-$(OPENGL_INCLUDE) \
 $(X_CFLAGS)
 
 WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
 
-OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
-
 GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) @DL_LIBRARY@
 
 LINK = $(CXX) -o $@