From: Włodzimierz Skiba Date: Wed, 28 Jul 2004 09:24:24 +0000 (+0000) Subject: Fixed lack of copying help. Regenerated makefiles. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/154fd1e4735bde68600b1901ddb3668d67216de0 Fixed lack of copying help. Regenerated makefiles. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index bde771e8c8..819df460a4 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -123,7 +123,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ ### Targets: ### -all: forty$(EXEEXT) $(__forty_bundle___depname) +all: forty$(EXEEXT) $(__forty_bundle___depname) data install: all @@ -170,6 +170,14 @@ forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP) +data: + @mkdir -p . + @for f in about.htm; do \ + if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f \) ; then \ + cp -pRf $(srcdir)/$$f . ; \ + fi; \ + done + forty_forty.o: $(srcdir)/forty.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< @@ -201,4 +209,4 @@ forty_forty_rc.o: $(srcdir)/forty.rc # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all install uninstall clean distclean forty_bundle +.PHONY: all install uninstall clean distclean forty_bundle data diff --git a/demos/forty/forty.bkl b/demos/forty/forty.bkl index 7db5894eb0..3296588c40 100644 --- a/demos/forty/forty.bkl +++ b/demos/forty/forty.bkl @@ -21,4 +21,10 @@ forty.rc + + + about.htm + + + diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc index 8137676ea7..e593dec3e9 100644 --- a/demos/forty/makefile.bcc +++ b/demos/forty/makefile.bcc @@ -167,7 +167,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\forty.exe +all: $(OBJS)\forty.exe data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -184,6 +184,10 @@ $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\forty_forty.res | +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + $(OBJS)\forty_forty.obj: .\forty.cpp $(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) $** diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc index 0ab1e3a00a..95f5c38668 100644 --- a/demos/forty/makefile.gcc +++ b/demos/forty/makefile.gcc @@ -172,7 +172,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\forty.exe +all: $(OBJS)\forty.exe data clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -181,6 +181,10 @@ clean: $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (about.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + $(OBJS)\forty_forty.o: ./forty.cpp $(CXX) -c -o $@ $(FORTY_CXXFLAGS) $< @@ -208,4 +212,4 @@ $(OBJS)\forty_scorefil.o: ./scorefil.cpp $(OBJS)\forty_forty_rc.o: ./forty.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples -.PHONY: all clean +.PHONY: all clean data diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index a14cb61f6e..cc81fabf5c 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -254,7 +254,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\forty.exe +all: $(OBJS)\forty.exe data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -268,6 +268,10 @@ $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res $(FORTY_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib << +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + $(OBJS)\forty_forty.obj: .\forty.cpp $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) $** diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index 6e2f651ba9..144ce66f7a 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -202,7 +202,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC $(OBJS)\forty.exe +all : .SYMBOLIC $(OBJS)\forty.exe data clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -222,6 +222,10 @@ $(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res wlink @$(OBJS)\forty.lbc +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + $(OBJS)\forty_forty.obj : .AUTODEPEND .\forty.cpp $(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<