fixed another @DEBUG@

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 38827752463a318e42e98ad74cea9c5d11ede4c4..84ced2d245311209e1354873d6e5dc96a3d14848 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -8,7 +8,7 @@
 # to override makefile variables. See wx/install/install.txt.
 # And you can override specific variables on the make command line, e.g.
 #
 # to override makefile variables. See wx/install/install.txt.
 # And you can override specific variables on the make command line, e.g.
 #

-# make -f makefile.unix DEBUG=''
+# make -f makefile.unix WXDEBUG=''

 #
 # You may prefer to use the GNU configure script than raw makefiles -
 # see contrib/wxshlib.
 #
 # You may prefer to use the GNU configure script than raw makefiles -
 # see contrib/wxshlib.


@@ -59,15 +59,15 @@ RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ --
 # Data General: -DDG
 # HP: -D_HPUX_SOURCE +a1 -Aa +d -z
 # IRIX: -mips2
 # Data General: -DDG
 # HP: -D_HPUX_SOURCE +a1 -Aa +d -z
 # IRIX: -mips2

-OPTIONS= -D__MINGW32__ # -D__EGCS__
+OPTIONS= # -D__MINGW32__ # -D__EGCS__

 
 # Debugging information
 # AIX: comment out.
 # IRIX: -g3
 
 # Debugging information
 # AIX: comment out.
 # IRIX: -g3

-DEBUGFLAGS = -ggdb
+DEBUGFLAGS = -ggdb -D__WXDEBUG__

 
 # Debug/trace mode. 1 or more for debugging.
 
 # Debug/trace mode. 1 or more for debugging.

-DEBUG=0
+WXDEBUG=0

 
 WIN95=1
 
 
 WIN95=1
 


@@ -203,8 +203,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) -DDEBUG='$(DEBUG)' $(WARN) $(OPT)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT)
+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
 
 # Extra patch link for XView
 LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
 
 # Extra patch link for XView