X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..6757b5e31cb48dd909754fdd5ceb5947585b76e1:/samples/vscroll/Makefile.in

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 6980ea59fb..52f8d83078 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -40,7 +41,7 @@ VSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 VSTEST_OBJECTS =  \
 	$(__vstest___win32rc) \
 	vstest_vstest.o
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +77,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
 	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o vstest$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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)
@@ -92,6 +93,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @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_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep vstest$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__vstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle
 
@@ -115,12 +119,13 @@ install-strip: install
 uninstall: 
 
 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)
+	$(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)
+	$(__vstest___os2_emxbindcmd)
 	$(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
+vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p vstest.app/Contents
 	mkdir -p vstest.app/Contents/MacOS
 	mkdir -p vstest.app/Contents/Resources
@@ -138,13 +143,13 @@ vstest.app/Contents: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
 	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 $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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
+@COND_PLATFORM_MACOSX_1@vstest_bundle: vstest.app/Contents/PkgInfo
 
 vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 vstest_vstest.o: $(srcdir)/vstest.cpp
 	$(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $<