latest CW additions

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 83f77c93c880df8d05190ac9eef31cd0f8013ea3..25281c2375d2a9d3055c13e37f0432ad1e694755 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -36,21 +36,25 @@ 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.
@@ -109,8 +113,8 @@ 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
@@ -136,7 +140,8 @@ OBJDIR = objects$(GUISUFFIX)
 # 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
+WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
+LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c