X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/341287bf49066e5dd84e971bd508ee3919ff4b46..e459f82d0110709444984bf739314f4a84de48d3:/src/makeg95.env?ds=sidebyside diff --git a/src/makeg95.env b/src/makeg95.env index 9f63cdba4c..67df3d0a74 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -31,42 +31,36 @@ CC = gcc CCC = $(CC) # Compiler used for LEX generated C -# AIX: use $(CCC) -CCLEX=$(CC) +CCLEX=gcc MAKE=make # LEX -LEX=flex.exe -t -L +LEX=flex # -t -L -# YACC. byacc or bison -# YACC=byacc.exe -YACC=bison.exe +# YACC. yacc or bison +# YACC=yacc +YACC=bison -# Resource compiler +# Settings for Cyginw/Mingw32 RESCOMP=windres.exe +RCINPUTSWITCH=-i +RCOUTPUTSWITCH=-o +RCINCSWITCH=--include-dir +RCDEFSWITCH=--define -RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ +RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__ ########################## Compiler flags ############################# # Miscellaneous compiler options -OPTIONS= # -D__MINGW32__ # -D__EGCS__ +OPTIONS= -D__EGCS__ # -D__MINGW32__ # Debugging information # AIX: comment out. # IRIX: -g3 DEBUGFLAGS = -ggdb -D__WXDEBUG__ -# Debug/trace mode. 1 or more for memory debugging. -# Unfortunately this doesn't seem to work with GnuWin32 - get warning: -# ../../include/wx/memory.h:58: warning: declaration of `operator delete(void *)' -# throws different exceptions -# :58: warning: previous declaration here -# So setting to 0 for now. - -WXDEBUG=0 - WIN95=1 ifeq ($(WIN95),0) @@ -100,7 +94,12 @@ GUI = -D__WXMSW__ -D__WINDOWS__ # Optimization # OPT = -O -OPT = + +# according to Guillermo Rodriguez Garcia 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). @@ -119,19 +118,19 @@ COMPPATHS= WINLIBS=-lstdc++ -lgcc \ - -lwinspool -lwinmm -lshell32 -loldnames \ - -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 + -lwinspool -lwinmm -lshell32 \ + -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)/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) -LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) +LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) @@ -141,12 +140,13 @@ XLIB=$(LIBS) LDLIBS = $(LIBS) # Directory for object files (don't change) -OBJDIR = objects$(GUISUFFIX) +# OBJDIR = objects$(GUISUFFIX) # You shouldn't need to change these... -CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT) -CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT) -LDFLAGS = -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib +CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) +CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) +WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows +LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS) .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c @@ -155,11 +155,11 @@ LDFLAGS = -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib # CPLUS_INCLUDE_PATH=/usr/H-i386-cygwin32/i386-cygwin32/include:/usr/H-i386-cygwin32/lib/gcc-lib/i386-cygwin32/cygnus-2.7.2-961023/include:$(WXDIR)/include/common:$(WXDIR)/include/msw:$(WXDIR)/contrib/fafa:$(WXDIR)/contrib/itsybits; \ # export CPLUS_INCLUDE_PATH RCINCLUDE; \ -.rc.$(RESSUFF): $< $(WXDIR)/include/msw/wx.rc - $(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS) +#.rc.$(RESSUFF): $< $(WXDIR)/include/msw/wx.rc +# $(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS) -.$(RESSUFF).$(RSCSUFF): $< - $(CVTRES) $< $*.$(RSCSUFF) +#.$(RESSUFF).$(RSCSUFF): $< +# $(CVTRES) $< $*.$(RSCSUFF) .$(SRCSUFF).$(OBJSUFF): $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)