fixed frame style

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 0fb9dfacee28fa4be142d5f15d25a2acc8ce2697..8af9e3640887252a30fee10193b09eecf49276a4 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -54,7 +54,7 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
 ########################## 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).
@@ -121,7 +126,7 @@ 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)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
+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)