use GetFont() instead of (possibly not initialized) m_font in GetCharWidth/Height()

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index b085f2fa8c49a61b73d5a0c1c201cafc125fc99a..ed4835ee07669754f2f67f21fd0b9b262546ebea 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,11 +8,15 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

+# read version numbers
+!include "version.mak"
+WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE)
+

 !if "$(RM)" == ""
 RM= erase
 !endif
 
 !if "$(RM)" == ""
 RM= erase
 !endif
 

-WXVERSION=233
+# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+

 WIN95=1
 
 !if "$(WIN95)" == "0"
 WIN95=1
 
 !if "$(WIN95)" == "0"


@@ -22,9 +26,9 @@ WIN95=1
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 # Generic WIN32
 !else
 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).
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).

-WINVERSION=-DWINVER=0x0400 /D__WIN95__
+WINVERSION=-DWINVER=0x0400

 !endif
 
 # On Alpha machines, change to CPU=ALPHA
 !endif
 
 # On Alpha machines, change to CPU=ALPHA


@@ -36,13 +40,16 @@ SRCSUFF=cpp
 
 WAITFLAG=/w
 
 
 WAITFLAG=/w
 

-# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
+# 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) -DSTRICT
 #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\
- 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
+WINFLAGS=-c -W3 -nologo -DWIN32 -D_WINDOWS $(WINVERSION) -DSTRICT
+WINLINKFLAGS=-nologo -machine:$(CPU) -subsystem:windows,$(APPVER)
+BASELINKFLAGS=-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 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)
 
 # Set a WXWIN environment variable be the path to your WXWIN directory
 WXDIR=$(WXWIN)


@@ -109,7 +116,14 @@ MSLU=0
 
 !ifndef FINAL
 FINAL=0
 
 !ifndef FINAL
 FINAL=0

-DEBUG=1
+!endif
+
+!ifndef DEBUGINFO
+!if "$(FINAL)" == "0"
+DEBUGINFO=1
+!else
+DEBUGINFO=0
+!endif

 !endif
 
 !ifndef DLL
 !endif
 
 !ifndef DLL


@@ -121,57 +135,72 @@ DLL=0
 NOPCH=0
 !endif
 
 NOPCH=0
 !endif
 

-# This sets 'D' to a suitable directory name
-# for this kind of build, and WXLIBNAME to one of wx (static release), wxd (static debug),
-# wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug)
+# This sets 'D' to a suitable directory name: [Base](Debug|Release|Hybrid)[Dll]
+# for this kind of build, and WXLIBNAME to one of wx(msw|base)[u][d] (static),
+# wx(msw|base)$(WXVERSION)[u][d] (DLL)

 
 

-!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wxmsw$(WXVERSION)
-!else
-WXLIBNAME=wxmsw
-!endif
-
-!if "$(NEW_WXLIBNAME)" != ""
-WXLIBNAME=$(NEW_WXLIBNAME)
+!if "$(UNICODE)" == "1"
+_WXLIB_SUFFIX=u
+_WXINC_SUFFIX=u
+_WXDIR_UNICODESUFFIX=Unicode

 !endif
 
 !endif
 

-!if "$(UNICODE)" == "1"
-UNIEXT=u
-WXLIBNAME=$(WXLIBNAME)$(UNIEXT)
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+_WXLIB_VERSION=$(WXVERSION)
+_WXDIR_DLLSUFFIX=Dll
+_WXINC_DLLSUFFIX=dll
+!else
+_WXLIB_VERSION=
+_WXDIR_DLLSUFFIX=
+_WXINC_DLLSUFFIX=

 !endif
 
 !if "$(FINAL)" == "1"
 !endif
 
 !if "$(FINAL)" == "1"

-D=Release
+_WXDIR_BUILD=Release
+LIBEXT=
+# no _WXDIR_SUFFIX

 !else if "$(FINAL)" == "hybrid"
 !else if "$(FINAL)" == "hybrid"

-D=Hybrid
+_WXDIR_BUILD=Hybrid

 LIBEXT=h
 LIBEXT=h

-WXLIBNAME=$(WXLIBNAME)$(LIBEXT)

 !else
 guilibsdll= oldnames.lib kernel32.lib \
   ws2_32.lib mswsock.lib advapi32.lib user32.lib \
   gdi32.lib comdlg32.lib winspool.lib
 !else
 guilibsdll= oldnames.lib kernel32.lib \
   ws2_32.lib mswsock.lib advapi32.lib user32.lib \
   gdi32.lib comdlg32.lib winspool.lib

-D=Debug
+_WXDIR_BUILD=Debug

 LIBEXT=d
 LIBEXT=d

-WXLIBNAME=$(WXLIBNAME)$(LIBEXT)

 !endif
 
 !if "$(wxUSE_GUI)" == "0"
 !endif
 
 !if "$(wxUSE_GUI)" == "0"

-WXLIBNAME=wxBase
-D=Base$(D)
-WXLIBNAME=$(WXLIBNAME)$(UNIEXT)$(LIBEXT)
+_WXDIR_PREFIX=Base
+_WXLIB_NAME=wxbase
+_WXINC_BUILD=base
+!else
+_WXDIR_PREFIX=
+_WXLIB_NAME=wxmsw
+_WXINC_BUILD=msw

 !endif
 
 !if "$(UNICODE)" == "1"
 !endif
 
 !if "$(UNICODE)" == "1"

-D=$(D)Unicode
+UNIFLAGS=-DUNICODE -D_UNICODE -DwxUSE_UNICODE=1

 !endif
 
 !endif
 

-INCEXT=$(UNIEXT)$(LIBEXT)
+!if "$(wxUSE_GUI)" == "0"
+UNIFLAGS=$(UNIFLAGS) -DwxUSE_GUI=0
+!endif

 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL
 INCEXT=dll$(INCEXT)
 !endif
 
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL
 INCEXT=dll$(INCEXT)
 !endif
 

+D=$(_WXDIR_PREFIX)$(_WXDIR_BUILD)$(_WXDIR_UNICODESUFFIX)$(_WXDIR_DLLSUFFIX)
+WXLIBNAME=$(_WXLIB_NAME)$(_WXLIB_VERSION)$(_WXLIB_SUFFIX)$(LIBEXT)
+INCEXT=$(_WXINC_SUFFIX)$(LIBEXT)
+
+!if "$(NEW_WXLIBNAME)" != ""
+WXLIBNAME=$(NEW_WXLIBNAME)
+!endif
+

 #----------------------------------------------------------------------
 # MSLU == Microsoft Layer for Unicode
 # See MSDN or the Platform SDK docs for details
 #----------------------------------------------------------------------
 # MSLU == Microsoft Layer for Unicode
 # See MSDN or the Platform SDK docs for details


@@ -182,13 +211,7 @@ MSLU_LIBS=$(MSLU_FLAGS) unicows.lib
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-!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
+INC=$(EXTRAINC) -I$(WXDIR)/lib/$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT) -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 = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib
 
 !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
 LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib


@@ -196,29 +219,38 @@ LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT)
 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
 
 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

 OPTIONS=
 
 OPTIONS=
 

+!if "$(DEBUGINFO)" == "0"
+
+!if "$(FINAL)" == "hybrid"
+OPT = /Ox /Gy
+!else
+# /O1 - smallest code
+# /O2 - fastest code
+OPT = /O1 # /O2 # /Od
+!endif
+
+LINK_DEBUG_FLAGS=/RELEASE
+
+!else
+OPT = /Od /Gy /Zi
+LINK_DEBUG_FLAGS=-debug:full -debugtype:cv
+!endif
+

 !if "$(FINAL)" == "0"
 !if "$(FINAL)" == "0"

-OPT = /Od /Gy

 # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated
 # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated

-DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR
-LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
+DEBUG_FLAGS= /D__WXDEBUG__ # /DDEBUG=1 # /FR

 _CRTFLAG=/MDd
 
 !else if "$(FINAL)" == "hybrid"
 _CRTFLAG=/MDd
 
 !else if "$(FINAL)" == "hybrid"

-OPT = /Ox /Gy

 DEBUG_FLAGS= /D__WXDEBUG__ /D__NO_VC_CRTDBG__
 DEBUG_FLAGS= /D__WXDEBUG__ /D__NO_VC_CRTDBG__

-LINK_DEBUG_FLAGS=/RELEASE

 _CRTFLAG=/MD
 
 !else
 _CRTFLAG=/MD
 
 !else

-# /O1 - smallest code
-# /O2 - fastest code
-OPT = /O1 # /O2 # /Od

 DEBUG_FLAGS=
 DEBUG_FLAGS=

-LINK_DEBUG_FLAGS=/RELEASE

 _CRTFLAG=/MD
 _CRTFLAG=/MD

+

 !endif
 
 
 !endif
 
 


@@ -226,12 +258,12 @@ _CRTFLAG=/MD
 CRTFLAG=$(_CRTFLAG)
 !endif
 
 CRTFLAG=$(_CRTFLAG)
 !endif
 

-!if "$(DLL)" == "0"
-

 !if "$(NOPCH)" == "1"
 !if "$(NOPCH)" == "1"

+

 PCH=
 PRECOMP=
 MAKEPRECOMP=
 PCH=
 PRECOMP=
 MAKEPRECOMP=

+

 !else
 
 !if "$(wxUSE_GUI)" == "0"
 !else
 
 !if "$(wxUSE_GUI)" == "0"


@@ -240,36 +272,42 @@ PCH=wxBase.pch
 PCH=wxWindows.pch
 !endif
 
 PCH=wxWindows.pch
 !endif
 

-PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\$D\vc60.pdb
+PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb

 MAKEPRECOMP=/YcWX/WXPREC.H
 MAKEPRECOMP=/YcWX/WXPREC.H

-!endif

 
 

+!endif

 
 

+!if "$(DLL)" == "0"

 
 

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX- $(OVERRIDEFLAGS)
+CPPFLAGS=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) $(OVERRIDEFLAGS)

 # If you don't include wxprec.h, use CPPFLAGS2
 # 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=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)
+

 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else
 !if "$(wxUSE_GUI)" == "0"
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
 !else

-LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
+LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS)

 !endif
 !endif

+

 DUMMY=dummy
 
 !else
 
 DUMMY=dummy
 
 !else
 

+CPPFLAGS= $(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDLL
+CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(EXTRAFLAGS) $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDLL
+
+!if "$(wxUSE_GUI)" == "0"
+LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS) -dll
+!else
+LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -dll
+!endif
+

 !if "$(WXMAKINGDLL)" == "1"
 !if "$(WXMAKINGDLL)" == "1"

-PCH=wxWindows.pch

 DUMMY=dummydll
 !else
 DUMMY=dummydll
 !else

-PCH=wxWindows.pch

 DUMMY=dummy
 !endif
 
 DUMMY=dummy
 !endif
 

-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)\$D\$(DUMMY).obj
 !endif
 
 DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj