X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9c4b1a2b5b926ced938130b2694b869403397cc..77cff606637e123ff279011919eb8c817e2149e1:/src/makeg95.env?ds=inline diff --git a/src/makeg95.env b/src/makeg95.env index 34d927865f..208820ed01 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 @@ -54,12 +54,14 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) ########################## Compiler flags ############################# # Miscellaneous compiler options -OPTIONS= -D__EGCS__ # -D__MINGW32__ +# GRG: The __EGCS__ symbol is not needed anymore! +OPTIONS= -D__MINGW32__ -DSTRICT # -D__EGCS__ + # Debugging information # AIX: comment out. # IRIX: -g3 -DEBUGFLAGS = -ggdb -D__WXDEBUG__ +DEBUGFLAGS = -D__WXDEBUG__ WIN95=1 @@ -92,9 +94,12 @@ WARN = -Wall # Which GUI, -Dwx_xview or -Dwx_motif (don't change this) GUI = -D__WXMSW__ -D__WINDOWS__ -# Optimization -# OPT = -O -OPT = +# according to Guillermo Rodriguez Garcia 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). @@ -114,7 +119,7 @@ COMPPATHS= 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 @@ -122,7 +127,7 @@ 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" +RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS) LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) @@ -136,6 +141,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)