Changed time of sending the wxSizeEvent and assorted things,

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 2b5dc81b6ed9cec3b18086323f5f5aba22459cde..9e8cef2a5ec5887a1f64fee683f1e8cf5784361d 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -20,7 +20,7 @@
 # For AIX/CSet++: use CC = xlC
 # For IRIX: use CC = CC
 # CC = gcc-2.6.2
-CC = gcc
+CC = gcc --pipe -fvtable-thunks
 
 # C compiler for pure C programs
 # Typical: CC=g++ , CCC=gcc
@@ -49,17 +49,18 @@ RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
 
-RESFLAGS=$(RCINCSWITCH) $(WXDIR)\include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
+# GRG: The __EGCS__ symbol is not needed anymore!
+OPTIONS= -DSTRICT # -D__MINGW32__ # -D__EGCS__
 
 # Debugging information
 # AIX: comment out.
 # IRIX: -g3
-DEBUGFLAGS = -ggdb -D__WXDEBUG__
+DEBUGFLAGS = -D__WXDEBUG__
 
 WIN95=1
 
@@ -92,42 +93,43 @@ WARN = -Wall
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 GUI = -D__WXMSW__ -D__WINDOWS__
 
-# Optimization
-# OPT = -O
-
-# 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)
-OPT = -fno-pcc-struct-return
+# 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
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
 AROPTIONS = ruv
 RANLIB = ranlib
 
-# Compiler libraries: defaults to GCC libraries
-#COMPLIBS=-lg++
-#for win95
-#COMPLIBS=-lgcc
+# Extra compiler libraries
+COMPLIBS=
 
 # Compiler or system-specific include paths
 COMPPATHS=
 
 ########################## Directories ###############################
 
-
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
-       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 #  -loldnames
+       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
+       -lole32 -loleaut32 -luuid \
+       -lodbc32 -lwsock32#  -loldnames
+
+#WINLIBS=-lstdc++ -lgcc \
+#      -lwinspool -lwinmm -lshell32 \
+#    -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames
 
 # Shouldn't need to change these...
-WXSRC=$(WXDIR)\src\msw
-WXINC=$(WXDIR)\include
-WXBASESRC=$(WXDIR)\src\common
-WXLIB=$(WXDIR)\lib\$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) -I$(WXDIR)\src\png -I$(WXDIR)\src\jpeg -I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\src\zlib $(EXTRAINC) $(COMPPATHS)
-RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
+WXSRC=$(WXDIR)/src/msw
+WXINC=$(WXDIR)/include
+WXBASESRC=$(WXDIR)/src/common
+WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) # -I$(WXDIR)/include/wx/msw/gnuwin32 
+RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
 LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
@@ -141,6 +143,7 @@ LDLIBS = $(LIBS)
 
 # 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)