Changed version number in DLL name to 23_0

Added a new value for the FINAL flag to make another kind of wxPython
build possible

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/jpeg/makefile.vc b/src/jpeg/makefile.vc
index b1fcfcb0258118ebadf075b226c98002ccd5caa1..d958b65e53d52b697449253932fc5177cb739111 100644 (file)
--- a/src/jpeg/makefile.vc
+++ b/src/jpeg/makefile.vc
@@ -81,6 +81,8 @@ TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj
 
 !if "$(FINAL)" == "1"
 LIBTARGET=..\..\lib\jpeg.lib
+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=..\..\lib\jpegh.lib
 !else
 LIBTARGET=..\..\lib\jpegd.lib
 !endif
@@ -96,7 +98,7 @@ defaulttarget:
 clean:
     -erase $(LIBTARGET)
     -erase *.obj
-    
+
 # Pull in standard variable definitions
 
 !include ..\makelib.vc

diff --git a/src/makevc.env b/src/makevc.env
index 1922707f70660437a775e1b263b9dae7797eb078..4566c9a4fd21bf50c762428f63578215c42dda99 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
-WXVERSION=22_0
+WXVERSION=23_0
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -124,6 +124,10 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 
 !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 \
@@ -156,6 +160,13 @@ OPT = /Od /Gy
 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
@@ -165,6 +176,7 @@ LINK_DEBUG_FLAGS=/RELEASE
 _CRTFLAG=/MD
 !endif
 
+
 !if "$(CRTFLAG)" == ""
 CRTFLAG=$(_CRTFLAG)
 !endif

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 61b7be06a5e0b0e3f88c7c31a34ac189a4991933..cf5e9f3af6b681da6426ef3f5b03dbb5dfb07d79 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -17,6 +17,8 @@ WINPNGINC = $(WINPNGDIR)
 
 !if "$(FINAL)" == "1"
 WINPNGLIB=..\..\lib\png.lib
+!else if "$(FINAL)" == "hybrid"
+WINPNGLIB=..\..\lib\pngh.lib
 !else
 WINPNGLIB=..\..\lib\pngd.lib
 !endif
@@ -38,13 +40,19 @@ CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
 CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 _CRTFLAG=/MDd
+!else if "$(FINAL)" == "hybrid"
+OPT = /Od
+CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC)
+LINKFLAGS=/NOD /CO /ONERROR:NOEXE
+_CRTFLAG=/MD
 !else
 # /Ox for real FINAL version
 OPT = /O2
 CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
 CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /ONERROR:NOEXE
-_CRTFLAG=/MDd
+_CRTFLAG=/MD
 !endif
 
 !if "$(CRTFLAG)" == ""

diff --git a/src/tiff/makefile.vc b/src/tiff/makefile.vc
index 5680063a259d1c34eb7d08921b46f8ec6af2fa26..6def8f7c5020b9e57855e490a98dfe26c56a37c9 100644 (file)
--- a/src/tiff/makefile.vc
+++ b/src/tiff/makefile.vc
@@ -1,6 +1,8 @@
 
 !if "$(FINAL)" == "1"
 LIBTARGET=$(WXDIR)\lib\tiff.lib
+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=$(WXDIR)\lib\tiffh.lib
 !else
 LIBTARGET=$(WXDIR)\lib\tiffd.lib
 !endif

diff --git a/src/xpm/makefile.vc b/src/xpm/makefile.vc
index 0336b1eb829274eac4310fe7cca042cd641e1ecd..6a2db85d80e974fc649110f716c966ff41c4a6c6 100644 (file)
--- a/src/xpm/makefile.vc
+++ b/src/xpm/makefile.vc
@@ -15,6 +15,8 @@ THISDIR=$(WXWIN)\src\xpm
 
 !if "$(FINAL)" == "1"
 LIBTARGET=$(WXDIR)\lib\xpm.lib
+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=$(WXDIR)\lib\xpmh.lib
 !else
 LIBTARGET=$(WXDIR)\lib\xpmd.lib
 !endif

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index fdcbbb97c7f0c6bf2e395d2c3bfdaf05e3a601fe..51b1348b741f0b3878a7c2b8b74725f1cf6c3528 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -17,6 +17,9 @@ FINAL=0
 !if "$(FINAL)" == "0"
 CFLAGS=/Od $(CRTFLAG) /GX
 _CRTFLAG=/MDd
+!else if "$(FINAL)" == "hybrid"
+CFLAGS=/Od $(CRTFLAG) /GX
+_CRTFLAG=/MD
 !else
 CFLAGS=-O2 $(CRTFLAG) /GX
 _CRTFLAG=/MD
@@ -36,6 +39,8 @@ O=.obj
 
 !if "$(FINAL)" == "1"
 LIBTARGET=..\..\lib\zlib.lib
+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=..\..\lib\zlibh.lib
 !else
 LIBTARGET=..\..\lib\zlibd.lib
 !endif