Misc release-related mods

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 1922707f70660437a775e1b263b9dae7797eb078..aa7e6e0d254f57288fb3e02b43b90b29d83b7069 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,11 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

-WXVERSION=22_0
+!if "$(RM)" == ""
+RM= erase
+!endif
+
+WXVERSION=23_0

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


@@ -36,6 +40,7 @@ WAITFLAG=/w
 #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)
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 #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)
 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
 
 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
 


@@ -124,6 +129,10 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 
 !if "$(FINAL)" == "1"
 D=Release
 
 !if "$(FINAL)" == "1"
 D=Release

+!else if "$(FINAL)" == "hybrid"
+D=Hybrid
+LIBEXT=h
+WXLIBNAME=$(WXLIBNAME)$(LIBEXT)

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


@@ -133,18 +142,24 @@ LIBEXT=d
 WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
 !endif
 
 WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
 !endif
 

+!if "$(wxUSE_GUI)" == "0"
+WXLIBNAME=wxBase
+D=Base$(D)
+WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
+!endif
+

 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL
 !endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 D=$(D)DLL
 !endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
+INC=$(EXTRAINC) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff

 
 

-!if "$(WXUSINGDLL)" == "1"
+!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"

 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
 !else
 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
 !else

-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(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


@@ -156,6 +171,13 @@ OPT = /Od /Gy
 DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR
 LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
 _CRTFLAG=/MDd
 DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR
 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
+_CRTFLAG=/MD
+

 !else
 # /O1 - smallest code
 # /O2 - fastest code
 !else
 # /O1 - smallest code
 # /O2 - fastest code


@@ -165,6 +187,7 @@ LINK_DEBUG_FLAGS=/RELEASE
 _CRTFLAG=/MD
 !endif
 
 _CRTFLAG=/MD
 !endif
 

+

 !if "$(CRTFLAG)" == ""
 CRTFLAG=$(_CRTFLAG)
 !endif
 !if "$(CRTFLAG)" == ""
 CRTFLAG=$(_CRTFLAG)
 !endif


@@ -176,15 +199,27 @@ PCH=
 PRECOMP=
 MAKEPRECOMP=
 !else
 PRECOMP=
 MAKEPRECOMP=
 !else

+  
+!if "$(wxUSE_GUI)" == "0"
+PCH=wxBase.pch
+!else

 PCH=wxvc.pch
 PCH=wxvc.pch

+!endif
+  

 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$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)
 # 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)
 CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(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)

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

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

+!endif

 DUMMY=dummy
 
 !else
 DUMMY=dummy
 
 !else


@@ -215,6 +250,12 @@ $(CPPFLAGS2) /Fo$@ /c $<
 $(CPPFLAGS2) /Fo$@ /c $<
 <<
 
 $(CPPFLAGS2) /Fo$@ /c $<
 <<
 

+#use CPPFLAGS2 so as not to use precompiled headers
+{}.c{$D}.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+

 {}.cpp{$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 {}.cpp{$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<