wxWizard added

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 2b5dc81b6ed9cec3b18086323f5f5aba22459cde..d58cb0006e4fd7c730419bc460a27cfc763cfadb 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -49,7 +49,7 @@ 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 #############################
 
@@ -59,7 +59,7 @@ OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
 # Debugging information
 # AIX: comment out.
 # IRIX: -g3
-DEBUGFLAGS = -ggdb -D__WXDEBUG__
+DEBUGFLAGS = -D__WXDEBUG__
 
 WIN95=1
 
@@ -92,14 +92,11 @@ 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
+OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
@@ -122,12 +119,12 @@ WINLIBS=-lstdc++ -lgcc \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 #  -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)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
+RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
 LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)