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 1cc2495852fd669ad64dd8629d9863ade80362f9..1ab59146d1a8103111d195d612ba7699c806c2cb 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -103,6 +103,10 @@ EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 UNICODE=0
 !endif
 
 UNICODE=0
 !endif
 

+!ifndef MSLU
+MSLU=0
+!endif
+

 !ifndef FINAL
 FINAL=0
 DEBUG=1
 !ifndef FINAL
 FINAL=0
 DEBUG=1


@@ -168,6 +172,14 @@ D=$(D)DLL
 INCEXT=dll$(INCEXT)
 !endif
 
 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
 
 !if "$(wxUSE_GUI)" == "0"
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 !if "$(wxUSE_GUI)" == "0"


@@ -179,9 +191,9 @@ INCTEMP=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT)
 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"
 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
 !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
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H