X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..f36fb06dc3f7f1e5be649cecaf26942db838dbb1:/samples/vscroll/Makefile.in

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 723edff3b3..1f603c49a3 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SETFILE = @SETFILE@
 TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 TOOLKIT = @TOOLKIT@
@@ -33,13 +34,13 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 LIBDIRNAME = $(top_builddir)lib
-VSCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+VSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
 	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
-VSCROLL_OBJECTS =  \
-	vscroll_vstest.o \
-	$(__vscroll___win32rc)
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS)
+VSTEST_OBJECTS =  \
+	$(__vstest___win32rc) \
+	vstest_vstest.o
 
 ### Conditionally set variables: ###
 
@@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
 	$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
 	$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-	$(__DLLFLAG_p_1) -o vscroll$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
+	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o vstest$(EXEEXT) Carbon.r \
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -118,23 +119,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__vscroll___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C vscroll$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_vscroll_rc.o
+@COND_PLATFORM_MAC_1@__vstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -a C vstest$(EXEEXT)
+@COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o
+@COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle
 
 ### Targets: ###
 
-all: vscroll$(EXEEXT)
+all: vstest$(EXEEXT) $(__vstest_bundle___depname)
 
 clean: 
-	rm -rf ./.deps
+	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f vscroll$(EXEEXT)
+	rm -f vstest$(EXEEXT)
+	rm -rf vstest.app
 
 distclean: clean
-	rm -f configure config.cache config.log config.status
-	rm -f bk-deps shared-ld-sh
+	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all
 
@@ -142,19 +144,43 @@ install-strip: install
 
 uninstall: 
 
-vscroll$(EXEEXT): $(VSCROLL_OBJECTS) $(__vscroll___win32rc)
-	$(CXX) -o $@ $(VSCROLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
-	$(__vscroll___mac_rezcmd)
-	$(__vscroll___mac_setfilecmd)
-
-vscroll_vscroll_rc.o: $(srcdir)/vscroll.rc
-	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
-
-vscroll_vstest.o: $(srcdir)/vstest.cpp
-	$(CXXC) -c -o $@ $(VSCROLL_CXXFLAGS) $<
+vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
+	$(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+	$(__vstest___mac_rezcmd)
+	$(__vstest___mac_setfilecmd)
+	$(SAMPLES_RPATH_POSTLINK)
+
+vstest.app/Contents: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+	mkdir -p vstest.app/Contents
+	mkdir -p vstest.app/Contents/MacOS
+	mkdir -p vstest.app/Contents/Resources
+	
+	
+	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+	-e "s/EXECUTABLE/vstest/" \
+	-e "s/VERSION/2.5.0/" \
+	$(top_srcdir)/src/mac/Info.plist.in >vstest.app/Contents/Info.plist
+	
+	
+	echo -n "APPL????" >vstest.app/Contents/PkgInfo
+	
+	
+	ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
+	
+	
+	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc vstest.app/Contents/Resources/vstest.rsrc
+	ln -f $(top_srcdir)/src/mac/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@vstest_bundle: vstest.app/Contents
+
+vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+
+vstest_vstest.o: $(srcdir)/vstest.cpp
+	$(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $<
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install uninstall
+.PHONY: all clean distclean install uninstall vstest_bundle