added test for writing empty value to the config

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index fec3d1afce54fb6112acf666b5051b31b0e8eaa3..dd0cf6467f3bfc619c3daa84965b23a08414a7b0 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -6,8 +6,9 @@ CFG = $(WXDIR)\src\msw\wxwin32.cfg
 # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXLIBDIR2 = $(WXDIR)\contrib\lib
 # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXLIBDIR2 = $(WXDIR)\contrib\lib

-WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;

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

+RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src

 
 # This should be changed to tlink32 if ilink32 is not available.
 # Ilink32 is available on BC++ 5.02 and above, and all
 
 # This should be changed to tlink32 if ilink32 is not available.
 # Ilink32 is available on BC++ 5.02 and above, and all


@@ -42,16 +43,16 @@ DLL=0
 #
 
 !if "$(WXMAKINGDLL)" == "1"
 #
 
 !if "$(WXMAKINGDLL)" == "1"

-DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx232.lib

 
 !else
 
 LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 
 !else
 
 LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"

-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx232.lib

 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib


@@ -60,7 +61,6 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 !endif
 
 !if "$(WXBUILDDLL)" == "1"
 !endif
 
 !if "$(WXBUILDDLL)" == "1"

-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL

 LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif
 
 LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif