Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 5f728e8f20242f2a465790c2f2775e324f0ad1b1..1ab59146d1a8103111d195d612ba7699c806c2cb 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -12,7 +12,7 @@
 RM= erase
 !endif
 
-WXVERSION=232
+WXVERSION=233
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -103,6 +103,10 @@ EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 UNICODE=0
 !endif
 
+!ifndef MSLU
+MSLU=0
+!endif
+
 !ifndef FINAL
 FINAL=0
 DEBUG=1
@@ -168,14 +172,28 @@ D=$(D)DLL
 INCEXT=dll$(INCEXT)
 !endif
 
+#----------------------------------------------------------------------
+# MSLU == Microsoft Layer for Unicode
+# See MSDN or the Platform SDK docs for details
+!if "$(MSLU)" == "1"
+MSLU_FLAGS=/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib
+MSLU_LIBS=$(MSLU_FLAGS) unicows.lib
+!endif
+
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
+!if "$(wxUSE_GUI)" == "0"
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/base$(INCEXT)
+!else
+INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT)
+!endif
+
+INC=$(INCTEMP) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib
+LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib
 !else
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
+LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
@@ -219,18 +237,18 @@ MAKEPRECOMP=
 !if "$(wxUSE_GUI)" == "0"
 PCH=wxBase.pch
 !else
-PCH=wxvc.pch
+PCH=wxWindows.pch
 !endif
 
-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\$D\vc60.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 
 
-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX $(OVERRIDEFLAGS)
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)
 # If you don't include wxprec.h, use CPPFLAGS2
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX $(OVERRIDEFLAGS)
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)
 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else
@@ -241,20 +259,20 @@ DUMMY=dummy
 !else
 
 !if "$(WXMAKINGDLL)" == "1"
-PCH=wxvc.pch
+PCH=wxWindows.pch
 DUMMY=dummydll
 !else
-PCH=wxvc.pch
+PCH=wxWindows.pch
 DUMMY=dummy
 !endif
 
-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 
-DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
+DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj
 
 .c.obj:
        cl @<<