header inclusion fix

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index d58cb0006e4fd7c730419bc460a27cfc763cfadb..208820ed01ce5435af9ba0d70d23a008ac32b896 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -54,7 +54,9 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options

-OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
+# GRG: The __EGCS__ symbol is not needed anymore!
+OPTIONS= -D__MINGW32__  -DSTRICT # -D__EGCS__
+

 
 # Debugging information
 # AIX: comment out.
 
 # Debugging information
 # AIX: comment out.


@@ -92,10 +94,11 @@ WARN = -Wall
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 GUI = -D__WXMSW__ -D__WINDOWS__
 
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 GUI = -D__WXMSW__ -D__WINDOWS__
 

-# according to Guillermo Rodriguez Garcia <guille@iies.es> this flag is needed
-# to make the standard div() functio work - otherwise it returns absolutely
-# incorrect results and completely breaks the wxImage class (where it's used
-# extensively)
+# according to Guillermo Rodriguez Garcia <guille@iies.es> this flag is
+# needed to make the standard div() function work - otherwise it returns
+# absolutely incorrect results and completely breaks the wxImage class
+# (where it's used extensively)
+# GRG: at least it is needed in mingw32-gcc2.8.1

 OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
 
 # Options for ar archiver
 OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
 
 # Options for ar archiver


@@ -116,7 +119,7 @@ COMPPATHS=
 
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
 
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \

-       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 #  -loldnames
+    -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames

 
 # Shouldn't need to change these...
 WXSRC=$(WXDIR)/src/msw
 
 # Shouldn't need to change these...
 WXSRC=$(WXDIR)/src/msw


@@ -138,6 +141,7 @@ LDLIBS = $(LIBS)
 
 # Directory for object files (don't change)
 # OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files (don't change)
 # OBJDIR = objects$(GUISUFFIX)

+OBJDIR = .

 
 # You shouldn't need to change these...
 CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS)
 
 # You shouldn't need to change these...
 CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS)