X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9c4b1a2b5b926ced938130b2694b869403397cc..c637d46187b7fc7019a102fdc6948de5f5cd9017:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 34d927865f..2b5dc81b6e 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -39,8 +39,8 @@ MAKE=make
 LEX=flex # -t -L
 
 # YACC. yacc or bison
-# YACC=yacc
-YACC=bison
+YACC=byacc
+#YACC=bison
 
 # Settings for Cyginw/Mingw32
 RESCOMP=windres.exe
@@ -49,12 +49,12 @@ 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__ # -D__MINGW32__
+OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
 
 # Debugging information
 # AIX: comment out.
@@ -94,7 +94,12 @@ GUI = -D__WXMSW__ -D__WINDOWS__
 
 # Optimization
 # OPT = -O
-OPT =
+
+# 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
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
@@ -117,11 +122,11 @@ 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)
+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)