passing CRTFLAG to subordinant makes

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

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 554d0c88e35aefa12c72f10f6dd343ea43016359..880244dbc39cb05b7c8fb92a502efebadd68a409 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -290,7 +290,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 png:
     cd $(WXDIR)\src\png
 
 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
 
 clean_png:
     cd $(WXDIR)\src\msw
 
 clean_png:


@@ -300,7 +300,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
 
 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
 
 clean_zlib:
     cd $(WXDIR)\src\msw
 
 clean_zlib:


@@ -310,7 +310,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
 
 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
 
 clean_jpeg:
     cd $(WXDIR)\src\msw
 
 clean_jpeg:


@@ -320,7 +320,7 @@ clean_jpeg:
 
 xpm:
     cd $(WXDIR)\src\xpm
 
 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
 
 clean_xpm:
     cd $(WXDIR)\src\msw
 
 clean_xpm:

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 3d370a60c59752590bf1d907afabe391e2e84692..40705836c49a20b3bb0d72ad83a9290fb411df13 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -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!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc


@@ -465,7 +465,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 png:
     cd $(WXDIR)\src\png
 
 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
 
 clean_png:
     cd $(WXDIR)\src\msw
 
 clean_png:


@@ -475,7 +475,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
 
 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
 
 clean_zlib:
     cd $(WXDIR)\src\msw
 
 clean_zlib:


@@ -485,7 +485,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
 
 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
 
 clean_jpeg:
     cd $(WXDIR)\src\msw
 
 clean_jpeg:


@@ -495,7 +495,7 @@ clean_jpeg:
 
 xpm:
     cd $(WXDIR)\src\xpm
 
 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
 
 clean_xpm:
     cd $(WXDIR)\src\msw
 
 clean_xpm:

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index e028f53f0f5416868f28e76b7e2078657e37d7e5..bd797dfff5783ecf702c2842d58b01bde9e3e557 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -2,7 +2,7 @@
 # File:                makefile.vc
 # Author:      Julian Smart
 # Created:     1993
 # File:                makefile.vc
 # Author:      Julian Smart
 # Created:     1993

-# Updated:     
+# Updated:

 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"


@@ -25,21 +25,28 @@ ZOPTION=
 FINAL=0
 !endif
 
 FINAL=0
 !endif
 

-PRECOMP=/YuWX.H 
+PRECOMP=/YuWX.H

 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !if "$(FINAL)" == "0"
 OPT = /Od

-CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
-CFLAGS= /W4 /Zi /MDd /GX /Od /D__WXMSW__ $(INC)
+CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /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
 # /Ox for real FINAL version
 OPT = /O2
 !else
 # /Ox for real FINAL version
 OPT = /O2

-CPPFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
-CFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
+CPPFLAGS= /W4 $(CRTFLAG) /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 \
  pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
  pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
 OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
  pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
  pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index 1af77a34f4afda414fdbebb7fc855891b8505fe7..f806ae9f1a5858e0d665b699a4480a5d1608abcb 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -15,11 +15,18 @@ FINAL=0
 !endif
 
 !if "$(FINAL)" == "0"
 !endif
 
 !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
 LD=cl
 LIB=tlib
 CC=cl
 LD=cl
 LIB=tlib


@@ -31,9 +38,9 @@ LIBTARGET=..\..\lib\zlib.lib
 
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
 
 # variables
 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)