The usual amount of trash over my telephone fixed

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 56230fadc7669cac4654f48bd4bb7540588ae629..83f77c93c880df8d05190ac9eef31cd0f8013ea3 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -39,8 +39,8 @@ MAKE=make
 LEX=flex.exe -t -L
 
 # YACC. byacc or bison
 LEX=flex.exe -t -L
 
 # YACC. byacc or bison

-YACC=byacc.exe
-# YACC=bison.exe
+# YACC=byacc.exe
+YACC=bison.exe

 
 # Resource compiler
 RESCOMP=windres.exe
 
 # Resource compiler
 RESCOMP=windres.exe


@@ -57,15 +57,6 @@ OPTIONS= # -D__MINGW32__ # -D__EGCS__
 # IRIX: -g3
 DEBUGFLAGS = -ggdb -D__WXDEBUG__
 
 # 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
-# <internal>:58: warning: previous declaration here
-# So setting to 0 for now.
-
-WXDEBUG=0
-

 WIN95=1
 
 ifeq ($(WIN95),0)
 WIN95=1
 
 ifeq ($(WIN95),0)


@@ -143,8 +134,8 @@ LDLIBS = $(LIBS)
 OBJDIR = objects$(GUISUFFIX)
 
 # You shouldn't need to change these...
 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
 LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c