Give wxScrolledWindow its own Layout method that takes into account

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 5baee82b97343bc24a723a6de849692bc0b2f806..1cc2495852fd669ad64dd8629d9863ade80362f9 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -12,7 +12,7 @@
 RM= erase
 !endif
 
-WXVERSION=23_2
+WXVERSION=233
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -37,8 +37,8 @@ SRCSUFF=cpp
 WAITFLAG=/w
 
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
-#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
-WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
+#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -DSTRICT
+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\
@@ -99,6 +99,10 @@ EXTRADLLFLAGS=
 EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
 !endif
 
+!ifndef UNICODE
+UNICODE=0
+!endif
+
 !ifndef FINAL
 FINAL=0
 DEBUG=1
@@ -118,15 +122,20 @@ NOPCH=0
 # wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wx$(WXVERSION)
+WXLIBNAME=wxmsw$(WXVERSION)
 !else
-WXLIBNAME=wx
+WXLIBNAME=wxmsw
 !endif
 
 !if "$(NEW_WXLIBNAME)" != ""
 WXLIBNAME=$(NEW_WXLIBNAME)
 !endif
 
+!if "$(UNICODE)" == "1"
+UNIEXT=u
+WXLIBNAME=$(WXLIBNAME)$(UNIEXT)
+!endif
+
 !if "$(FINAL)" == "1"
 D=Release
 !else if "$(FINAL)" == "hybrid"
@@ -145,16 +154,29 @@ WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
 !if "$(wxUSE_GUI)" == "0"
 WXLIBNAME=wxBase
 D=Base$(D)
-WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
+WXLIBNAME=$(WXLIBNAME)$(UNIEXT)$(LIBEXT)
+!endif
+
+!if "$(UNICODE)" == "1"
+D=$(D)Unicode
 !endif
 
+INCEXT=$(UNIEXT)$(LIBEXT)
+
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL
+INCEXT=dll$(INCEXT)
 !endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=$(EXTRAINC) -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
@@ -203,18 +225,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 /DSTRICT $(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 /DSTRICT $(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
@@ -225,20 +247,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 @<<