Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

passing CRTFLAG to subordinant makes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-10-09 07:09:46 +00:00
parent 45016e1a6b
commit 3156ba6ea6
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/msw/tmake/vc.t
View File

@@ -290,7 +290,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
png: png:
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_png: clean_png:
@@ -300,7 +300,7 @@ clean_png:
zlib: zlib:
cd $(WXDIR)\src\zlib cd $(WXDIR)\src\zlib
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_zlib: clean_zlib:
@@ -310,7 +310,7 @@ clean_zlib:
jpeg: jpeg:
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_jpeg: clean_jpeg:
@@ -320,7 +320,7 @@ clean_jpeg:
xpm: xpm:
cd $(WXDIR)\src\xpm cd $(WXDIR)\src\xpm
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_xpm: clean_xpm:

10
src/msw/makefile.vc
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 13:22, 1999/10/06 # This file was automatically generated by tmake at 23:29, 1999/10/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc # File: makefile.vc
@@ -465,7 +465,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
png: png:
cd $(WXDIR)\src\png cd $(WXDIR)\src\png
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_png: clean_png:
@@ -475,7 +475,7 @@ clean_png:
zlib: zlib:
cd $(WXDIR)\src\zlib cd $(WXDIR)\src\zlib
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_zlib: clean_zlib:
@@ -485,7 +485,7 @@ clean_zlib:
jpeg: jpeg:
cd $(WXDIR)\src\jpeg cd $(WXDIR)\src\jpeg
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_jpeg: clean_jpeg:
@@ -495,7 +495,7 @@ clean_jpeg:
xpm: xpm:
cd $(WXDIR)\src\xpm cd $(WXDIR)\src\xpm
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
clean_xpm: clean_xpm:

19
src/png/makefile.vc
View File

@@ -2,7 +2,7 @@
# File: makefile.vc # File: makefile.vc
# Author: Julian Smart # Author: Julian Smart
# Created: 1993 # Created: 1993
# Updated: # Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh # Copyright: (c) 1993, AIAI, University of Edinburgh
# #
# "%W% %G%" # "%W% %G%"
@@ -25,21 +25,28 @@ ZOPTION=
FINAL=0 FINAL=0
!endif !endif
PRECOMP=/YuWX.H PRECOMP=/YuWX.H
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
OPT = /Od OPT = /Od
CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC) CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
CFLAGS= /W4 /Zi /MDd /GX /Od /D__WXMSW__ $(INC) CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC)
LINKFLAGS=/NOD /CO /ONERROR:NOEXE LINKFLAGS=/NOD /CO /ONERROR:NOEXE
_CRTFLAG=/MDd
!else !else
# /Ox for real FINAL version # /Ox for real FINAL version
OPT = /O2 OPT = /O2
CPPFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC) CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
CFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC) CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
LINKFLAGS=/NOD /ONERROR:NOEXE LINKFLAGS=/NOD /ONERROR:NOEXE
_CRTFLAG=/MDd
!endif !endif
!if "$(CRTFLAG)" == ""
CRTFLAG=$(_CRTFLAG)
!endif
OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \ pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj

15
src/zlib/makefile.vc
View File

@@ -15,11 +15,18 @@ FINAL=0
!endif !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
CFLAGS=/Od /MDd /GX CFLAGS=/Od $(CRTFLAG) /GX
_CRTFLAG=/MDd
!else !else
CFLAGS=-O2 /MD /GX CFLAGS=-O2 $(CRTFLAG) /GX
_CRTFLAG=/MD
!endif !endif
!if "$(CRTFLAG)" == ""
CRTFLAG=$(_CRTFLAG)
!endif
CC=cl CC=cl
LD=cl LD=cl
LIB=tlib LIB=tlib
@@ -31,9 +38,9 @@ LIBTARGET=..\..\lib\zlib.lib
# variables # variables
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
trees$(O) trees$(O)
OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
infutil$(O) inffast$(O) infutil$(O) inffast$(O)
all: $(LIBTARGET) all: $(LIBTARGET)