AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed version number in DLL name to 23_0

Browse Source 
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
This commit is contained in:
Robin Dunn 2000-10-31 23:12:24 +00:00
parent 7b30ac82dd
commit f641dada64
6 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jpeg/makefile.vc
View File

@ -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

14
src/makevc.env
View File

@ -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

10
src/png/makefile.vc
View File

@ -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)" == ""

2
src/tiff/makefile.vc
View File

@ -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

2
src/xpm/makefile.vc
View File

@ -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

5
src/zlib/makefile.vc
View File

@ -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