From 3eb14b8c9883e2b8d3e56330b6c6ebd9c0d9ea9b Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 18 Jun 2003 12:59:17 +0000 Subject: [PATCH] fix perl commands for makefile.sc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/sc.t | 20 ++++++++++++++------ src/msw/makefile.sc | 8 ++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t index 4fd0c2003d..8e88b03128 100644 --- a/distrib/msw/tmake/sc.t +++ b/distrib/msw/tmake/sc.t @@ -93,13 +93,14 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS"); # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -all: MAKEARCHDIR MAKELIBS $(LIBTARGET) zlib png jpeg tiff regex +all: MAKEARCHDIR MAKELIBS PCH $(LIBTARGET) zlib png jpeg tiff regex MAKEARCHDIR: @if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR) @if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h + @if not exist $(WXOUTDIR)\nul mkdir $(WXOUTDIR) #build our own copies of missing libraries MAKELIBS: @@ -110,7 +111,7 @@ $(LIBTARGET): $(OBJECTS) -del $(LIBTARGET) *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul; -clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex +clean: clean_msw clean_zlib clean_png clean_jpeg clean_tiff clean_regex clean_pch clean_msw: -del $(COMMDIR)\*.obj @@ -122,6 +123,14 @@ clean_msw: -del ole\*.obj -del $(LIBTARGET) +PCH: $(INCDIR)\wx\wxprec.h + dmc $(CPPFLAGS) $(CFLAGS) $(INCLUDE) -HF$(WXOUTDIR)\wxprec.SYM -o$(WXOUTDIR)\wxprec.PCO $(INCDIR)\wx\wxprec.h + +clean_pch: + del $(WXOUTDIR)\*.sym + del $(WXOUTDIR)\*.PCO + + png: make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL) @@ -153,7 +162,6 @@ clean_tiff: make -f $(WXDIR)\src\tiff\makefile.sc clean MFTYPE=sc -makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t - cd $(WXWIN)\distrib\msw\tmake - tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) - copy makefile.$(MFTYPE) $(WXWIN)\src\msw +self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t + perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc + copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index d0baac215c..ea8662e775 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -364,6 +364,7 @@ clean_pch: del $(WXOUTDIR)\*.sym del $(WXOUTDIR)\*.PCO + png: make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL) @@ -395,7 +396,6 @@ clean_tiff: make -f $(WXDIR)\src\tiff\makefile.sc clean MFTYPE=sc -makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t - cd $(WXWIN)\distrib\msw\tmake - tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) - copy makefile.$(MFTYPE) $(WXWIN)\src\msw +self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t + perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc + copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw -- 2.47.2