Converted the virtual-methods-callbacks into real events, leaving the

[wxWidgets.git] / src / make.env

diff --git a/src/make.env b/src/make.env
index a3d6a48b497ac1ba2b2c556a5457b8414d88d600..b07e47c570d24215a9c268fb89c8bdbde0f39d50 100644 (file)
--- a/src/make.env
+++ b/src/make.env
@@ -35,7 +35,7 @@ GUISUFFIX   = _stubs
 ########################## Compiler flags #############################
 
 # Misc options
 ########################## Compiler flags #############################
 
 # Misc options

-OPTIONS     = -D__WXDEBUG__ -DWXDEBUG
+OPTIONS     = -D__WXDEBUG__ # -DDEBUG='$(DEBUG)' # -DWXDEBUG

 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =
 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =


@@ -74,8 +74,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 

-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)

 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)