corrected use of Print Manager Session APIs for Carbon targets

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index fec3d1afce54fb6112acf666b5051b31b0e8eaa3..3d528c4a080e5d4fe9e3eaa5133c290997bd71a4 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -6,7 +6,7 @@ CFG = $(WXDIR)\src\msw\wxwin32.cfg
 # 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__
 
 # This should be changed to tlink32 if ilink32 is not available.
@@ -42,16 +42,16 @@ DLL=0
 #
 
 !if "$(WXMAKINGDLL)" == "1"
-DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx231.lib
 
 !else
 
 LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx231.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib
@@ -60,7 +60,6 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 !endif
 
 !if "$(WXBUILDDLL)" == "1"
-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
 LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif