More style issues

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index 739cc9a2ad5de5df71187ded180178f44921b3f5..857e503f62b1d0c12d0f952719d09726ee99114a 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -15,6 +15,8 @@ BCCDIR=$(MAKEDIR)\..
 
 ARCHINCDIR=$(WXDIR)\lib\msw
 ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
+#see below for SETUPSRCDIR
+
 
 # Using a config file isn't compatible across all BC++ versions
 # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
@@ -81,6 +83,20 @@ WXLIBNAME=wx32
 WXLIBNAME=wx32
 !endif
 
+## Use this if you want to use the UNIV controls set rather than the native ones 
+## make -f makefile.b32 WXUSINGUNIV=1
+!if "$(WXUSINGUNIV)" == "1"
+USE_UNIV="UNIV"
+CFG=$(CFG)v
+WXLIBNAME=$(WXLIBNAME)v
+ARCHINCDIR=$(ARCHINCDIR)v
+SETUPSRCDIR=$(WXDIR)\include\wx\univ
+PORT=__WXUNIVERSAL__
+!else
+USE_UNIV=""
+PORT=__WXMSW__
+SETUPSRCDIR=$(WXDIR)\include\wx\msw
+!endif
 
 #not sure what to do with unicode builds - we need to define something ?
 #!if "$(UNICODE)" == "1"
@@ -137,7 +153,7 @@ LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif
 
 CFG=$(CFG).cfg
-CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
+CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) @$(CFG) $(EXTRACPPFLAGS)
 
 DUMMY=dummy