X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff06420077c5d0cb65196bca1084d13aaf96a2f2..5eac771d0949d4696c7c29f2ead81a2d0b0b73c8:/src/makevc.env?ds=inline

diff --git a/src/makevc.env b/src/makevc.env
index a90795b8f0..43ed03f780 100644
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -12,7 +12,9 @@
 RM= erase
 !endif
 
-WXVERSION=233
+WXVERSION=250
+
+# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -22,7 +24,7 @@ WIN95=1
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 # Generic WIN32
 !else
-APPVER=3.50 # 4.0
+APPVER=4.0
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 /D__WIN95__
 !endif
@@ -42,7 +44,7 @@ WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION) -DSTRICT
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 BASELINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:console,$(APPVER)
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
- comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
+ comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
 
 # Set a WXWIN environment variable be the path to your WXWIN directory
 WXDIR=$(WXWIN)
@@ -103,6 +105,10 @@ EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 UNICODE=0
 !endif
 
+!ifndef MSLU
+MSLU=0
+!endif
+
 !ifndef FINAL
 FINAL=0
 DEBUG=1
@@ -168,14 +174,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
@@ -189,9 +209,9 @@ LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
 _CRTFLAG=/MDd
 
 !else if "$(FINAL)" == "hybrid"
-OPT = /Od /Gy
-DEBUG_FLAGS= /Zi /D__WXDEBUG__ /D__NO_VC_CRTDBG__
-LINK_DEBUG_FLAGS=-debug:full -debugtype:cv
+OPT = /Ox /Gy
+DEBUG_FLAGS= /D__WXDEBUG__ /D__NO_VC_CRTDBG__
+LINK_DEBUG_FLAGS=/RELEASE
 _CRTFLAG=/MD
 
 !else