X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b037754f53cc35e177bf6787bace26c7cecc6e1..ea9a4296a23fa5b1441e9d3abca357fe7cb412b5:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 83f77c93c8..208820ed01 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -36,26 +36,32 @@ 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=byacc
+#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__
+# 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
 
@@ -88,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 <guille@iies.es> 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).
@@ -109,19 +118,19 @@ COMPPATHS=
 
 
 WINLIBS=-lstdc++ -lgcc \
-	-lwinspool -lwinmm -lshell32 -loldnames \
-	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32
+	-lwinspool -lwinmm -lshell32 \
+    -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -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)
-RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
+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)
 
@@ -131,12 +140,14 @@ XLIB=$(LIBS)
 LDLIBS = $(LIBS)
 
 # Directory for object files (don't change)
-OBJDIR = objects$(GUISUFFIX)
+# OBJDIR = objects$(GUISUFFIX)
+OBJDIR = .
 
 # You shouldn't need to change these...
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(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
 
@@ -145,11 +156,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)