X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c3a6972f471bd792eb8d812049c68bccd56a2a9..0e2ff612070d7df3e36d786c213b14a8fd97a83b:/contrib/samples/deprecated/treelay/Makefile.in?ds=sidebyside

diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in
index 5a5b1a8676..3c53afd531 100644
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/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 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 TREELAY_OBJECTS =  \
 	treelay_treelay.o \
 	$(__treelay___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -77,7 +78,7 @@ 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 -i \
 	$(srcdir)/../../../include -o treelay$(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)
@@ -93,6 +94,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__treelay___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C treelay$(EXEEXT)
+COND_PLATFORM_OS2_1___treelay___os2_emxbindcmd = $(NM) treelay$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep treelay$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__treelay___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treelay___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__treelay___win32rc = treelay_treelay_rc.o
 @COND_PLATFORM_MACOSX_1@__treelay_bundle___depname = treelay_bundle
 
@@ -114,12 +118,13 @@ install: all
 install-strip: install
 
 treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
-	$(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__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 $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)  $(__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)
 	$(__treelay___mac_rezcmd)
 	$(__treelay___mac_setfilecmd)
+	$(__treelay___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p treelay.app/Contents
 	mkdir -p treelay.app/Contents/MacOS
 	mkdir -p treelay.app/Contents/Resources
@@ -137,7 +142,7 @@ treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	ln -f treelay$(EXEEXT) treelay.app/Contents/MacOS/treelay
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treelay.app/Contents/Resources/treelay.rsrc
+	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc treelay.app/Contents/Resources/treelay.rsrc
 	ln -f $(top_srcdir)/src/mac/wxmac.icns treelay.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@treelay_bundle: treelay.app/Contents/PkgInfo
@@ -146,7 +151,7 @@ treelay_treelay.o: $(srcdir)/treelay.cpp
 	$(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 treelay_treelay_rc.o: $(srcdir)/treelay.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 --include-dir $(srcdir)/../../../include
+	$(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 --include-dir $(srcdir)/../../../include
 
 uninstall: