Add images with arrows of the combo sample to build system.

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

diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 52ae9f7ebc7f0cf17f8bab4f89c99818207b6cdd..8f2df478a621ff11df7db73b9ccea6d744e7513a 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -136,7 +136,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
 
 ### Targets: ###
 
-all: combo$(EXEEXT) $(__combo_bundle___depname)
+all: combo$(EXEEXT) $(__combo_bundle___depname) data
 
 install: all
 
@@ -182,6 +182,18 @@ combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
 
 @COND_PLATFORM_MACOSX_1@combo_bundle: $(____combo_BUNDLE_TGT_REF_DEP)
 
+data: 
+       @mkdir -p .
+       @for f in dropbuth.png dropbutn.png dropbutp.png; do \
+       if test ! -f ./$$f -a ! -d ./$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+       fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/$$f . ;; \
+       esac; \
+       done
+
 combo_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
@@ -192,4 +204,4 @@ combo_combo.o: $(srcdir)/combo.cpp
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean combo_bundle
+.PHONY: all install uninstall clean distclean combo_bundle data

diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc
index 9f8b76823067561bc789f7a9f4902c5cffb4e114..096eaa710c1cc2d2bebc758e809d37e7c69dde9a 100644 (file)
--- a/samples/combo/makefile.bcc
+++ b/samples/combo/makefile.bcc
@@ -203,7 +203,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\combo.exe
+all: $(OBJS)\combo.exe data
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -221,6 +221,10 @@ $(OBJS)\combo.exe: $(COMBO_OBJECTS)  $(OBJS)\combo_sample.res
        c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_ADV_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res
 |
 
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\combo_sample.res: .\..\..\samples\sample.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 

diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc
index eef4265a115741b33baa0d3b3dc84737f7d15581..b8fb291ba072003352f7d444e6c01418746ff88a 100644 (file)
--- a/samples/combo/makefile.gcc
+++ b/samples/combo/makefile.gcc
@@ -204,7 +204,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\combo.exe
+all: $(OBJS)\combo.exe data
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -214,13 +214,17 @@ clean:
 $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o
        $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_ADV_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__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 (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
 $(OBJS)\combo_sample_rc.o: ./../../samples/sample.rc
        windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 
 $(OBJS)\combo_combo.o: ./combo.cpp
        $(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $<
 
-.PHONY: all clean
+.PHONY: all clean data
 
 
 # Dependencies tracking:

diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc
index fc625820003fa5cf70b8f421e98329ec66834238..2c555e7247daaa7e5f263233d2a27597ac7e9517 100644 (file)
--- a/samples/combo/makefile.vc
+++ b/samples/combo/makefile.vc
@@ -281,7 +281,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\combo.exe
+all: $(OBJS)\combo.exe data
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -296,6 +296,10 @@ $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
        $(COMBO_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_ADV_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__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 odbc32.lib
 <<
 
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\combo_sample.res: .\..\..\samples\sample.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
 

diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat
index ec4f2cc6b6fb97d647fd1b5de77a3d9566837922..8fc8e8a2446859642bba2629b250506acc4b191b 100644 (file)
--- a/samples/combo/makefile.wat
+++ b/samples/combo/makefile.wat
@@ -228,7 +228,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\combo.exe
+all : .SYMBOLIC $(OBJS)\combo.exe data
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -250,6 +250,10 @@ $(OBJS)\combo.exe :  $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
        @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i
        wlink @$(OBJS)\combo.lbc
 
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\combo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<