General tidy-up (mainly typecasts) to allow the use of the SGI native

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index a75af4a4f823785f5adc1033f8fafa7d83906fb5..57e62fa08104eca3e13864e7d571db212701c07d 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -4,7 +4,7 @@ WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include

-WIN95FLAG = -D__WIN95__
+WIN95FLAG = -D__WIN95__ -D__WINDOWS__

 
 !ifndef FINAL
 FINAL=0
 
 !ifndef FINAL
 FINAL=0


@@ -12,7 +12,7 @@ FINAL=0
 
 !if "$(FINAL)" == "0"
 OPT = -Od
 
 !if "$(FINAL)" == "0"
 OPT = -Od

-DEBUG_FLAGS= -v -DDEBUG=1 -D__DEBUG__ -DUSE_DEFINE
+DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE

 !else
 OPT = -O2
 DEBUG_FLAGS = -DUSE_DEFINE
 !else
 OPT = -O2
 DEBUG_FLAGS = -DUSE_DEFINE