Added GSocket/wxSocket alias to socket.h to prevent us from using GSocket

[wxWidgets.git] / src / make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index a0ee460ddc230345c2f10717cc02d7134045dd35..307066715239838df48fe1b30596c8a6c970d3dc 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -11,10 +11,11 @@
 ####################### GENERAL SETTINGS ############################
 
 
-EXTRALIBS = @EXTRA_LIBS@
+EXTRA_LIBS = @EXTRA_LIBS@
 LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
 
 TOOLKIT = @TOOLKIT@
+TOOLKITDIR = @TOOLKIT_DIR@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
@@ -25,10 +26,6 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
-########################### Misc #################################
-
-SHELL = @SHELL@
-
 ########################### Programs #################################
 
 # C++ compiler
@@ -60,8 +57,8 @@ SHARED_LD   = @SHARED_LD@
 ########################### Flags #################################
 
 CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 PICFLAGS = @PIC_FLAG@
-
+LDFLAGS = @LDFLAGS@