some really minor changes (the most important one: small memory hole in

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index d9aa03c77650db8520e71f3e3c33cc1aadef65bc..83f77c93c880df8d05190ac9eef31cd0f8013ea3 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -31,8 +31,7 @@ CC = gcc
 CCC = $(CC)
 
 # Compiler used for LEX generated C
-# AIX: use $(CCC)
-CCLEX=$(CC)
+CCLEX=gcc
 
 MAKE=make
 
@@ -51,14 +50,6 @@ RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ --
 ########################## 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__
 
 # Debugging information
@@ -66,9 +57,6 @@ OPTIONS= # -D__MINGW32__ # -D__EGCS__
 # IRIX: -g3
 DEBUGFLAGS = -ggdb -D__WXDEBUG__
 
-# Debug/trace mode. 1 or more for debugging.
-WXDEBUG=0
-
 WIN95=1
 
 ifeq ($(WIN95),0)
@@ -95,10 +83,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,9 +90,6 @@ 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 =
 
 # Options for ar archiver
@@ -117,24 +98,11 @@ 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 ###############################
@@ -142,7 +110,7 @@ COMPPATHS=
 
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 -loldnames \
-       -lcomctl32 -lctl3d32 -lodbc32
+       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32
 
 # Shouldn't need to change these...
 WXSRC=$(WXDIR)/src/msw
@@ -166,8 +134,8 @@ LDLIBS = $(LIBS)
 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)
+CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
 LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c