X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..837e57436a89516a5fa9f478f401e06bd872c17c:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index d9aa03c776..8af9e36408 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -31,44 +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
-# Solaris/GCC: -DSVR4
-# Solaris/GCC, dynamic library: -DSVR4 -fPIC
-# FreeBDS 2.0: does not need -D_BSD - always defined
-# AIX/CSet++: -+ -qsrcmsg -DSYSV
-# AIX/GCC: -DSYSV -DAIX
-# Data General: -DDG
-# HP: -D_HPUX_SOURCE +a1 -Aa +d -z
-# IRIX: -mips2
-OPTIONS= # -D__MINGW32__ # -D__EGCS__
+OPTIONS= -D__EGCS__  -DSTRICT # -D__MINGW32__
 
 # Debugging information
 # AIX: comment out.
 # IRIX: -g3
 DEBUGFLAGS = -ggdb -D__WXDEBUG__
 
-# Debug/trace mode. 1 or more for debugging.
-WXDEBUG=0
-
 WIN95=1
 
 ifeq ($(WIN95),0)
@@ -95,10 +87,6 @@ RESSUFF=res
 RSCSUFF=rsc
 
 # Warnings
-# AIX: comment out
-# IRIX: -w -wlint,-fpiv
-# These are for the GNU compiler. We now get the compiler to check for as
-# many things as we can, to catch portability problems sooner.
 WARN = -Wall
 
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
@@ -106,10 +94,12 @@ GUI = -D__WXMSW__ -D__WINDOWS__
 
 # Optimization
 # OPT = -O
-# FreeBSD 2.0 with i486: OPT = -O2 -m486
-# IRIX: -O2 #-O0 : no, -O1: quick, -O2: global -O3: full(register)
-# Linux: -m486 # -O2 for optimization
-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,43 +107,30 @@ AROPTIONS = ruv
 RANLIB = ranlib
 
 # Compiler libraries: defaults to GCC libraries
-# Solaris: -lgen -ldl -lsocket -lnsl
-#   and/or possibly -lucb, whatever that is... (-lucb CAUSES MOTIF FILE SELECTION PROBLEMS)
-#   or possibly -lgen -lsocket -L/usr/ccs/lib linbnsl.a 
-# GCC > 2.7.1 on Solaris: -lstdc++ -lc -lgen -ldl -lsocket -lnsl -lucb 
-# SGI:     -lPW
-# FreeBSD 2.0: -lg++ -lcompat
-# FreeBSD 1.x: -lcompat doesn`t need, only -lg++ needed
-# AIX: -lCns -lbsd
-# G++ 2.7.0 requires -liostream too.
-# IRIX: -lPW
 #COMPLIBS=-lg++
 #for win95
 #COMPLIBS=-lgcc
 
 # Compiler or system-specific include paths
-# E.g. some SPARCStations need
-# -I/usr/ucbinclude/sys
-#added for win95
 COMPPATHS=
 
 ########################## Directories ###############################
 
 
 WINLIBS=-lstdc++ -lgcc \
-	-lwinspool -lwinmm -lshell32 -loldnames \
-	-lcomctl32 -lctl3d32 -lodbc32
+	-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)
 
@@ -163,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
 
@@ -177,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)