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

fix perl commands for makefile.sc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-06-18 12:59:17 +00:00
parent 7d5848668d
commit 3eb14b8c98
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
distrib/msw/tmake/sc.t
View File

@@ -93,13 +93,14 @@ MSWOBJS = #$ ExpandList("WXMSWOBJS");
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) 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: MAKEARCHDIR:
@if not exist $(MSWINCDIR)\setup.h copy $(MSWINCDIR)\setup0.h $(MSWINCDIR)\setup.h @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)
@if not exist $(ARCHINCDIR)\wx\setup.h mkdir $(ARCHINCDIR)\wx @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 $(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 #build our own copies of missing libraries
MAKELIBS: MAKELIBS:
@@ -110,7 +111,7 @@ $(LIBTARGET): $(OBJECTS)
-del $(LIBTARGET) -del $(LIBTARGET)
*lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul; *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: clean_msw:
-del $(COMMDIR)\*.obj -del $(COMMDIR)\*.obj
@@ -122,6 +123,14 @@ clean_msw:
-del ole\*.obj -del ole\*.obj
-del $(LIBTARGET) -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: png:
make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL) make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
@@ -153,7 +162,6 @@ clean_tiff:
make -f $(WXDIR)\src\tiff\makefile.sc clean make -f $(WXDIR)\src\tiff\makefile.sc clean
MFTYPE=sc MFTYPE=sc
makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXWIN)\distrib\msw\tmake perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw
copy makefile.$(MFTYPE) $(WXWIN)\src\msw

8
src/msw/makefile.sc
View File

@@ -364,6 +364,7 @@ clean_pch:
del $(WXOUTDIR)\*.sym del $(WXOUTDIR)\*.sym
del $(WXOUTDIR)\*.PCO del $(WXOUTDIR)\*.PCO
png: png:
make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL) make -f $(WXDIR)\src\png\makefile.sc FINAL=$(FINAL)
@@ -395,7 +396,6 @@ clean_tiff:
make -f $(WXDIR)\src\tiff\makefile.sc clean make -f $(WXDIR)\src\tiff\makefile.sc clean
MFTYPE=sc MFTYPE=sc
makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t self : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXWIN)\distrib\msw\tmake perl -x$(WXWIN)\distrib\msw\tmake -S tmake -t$(MFTYPE) wxwin.pro -o $(WXWIN)\distrib\msw\tmake\makefile.sc
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) copy $(WXWIN)\distrib\msw\tmake\makefile.$(MFTYPE) $(WXWIN)\src\msw
copy makefile.$(MFTYPE) $(WXWIN)\src\msw