X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c3a6972f471bd792eb8d812049c68bccd56a2a9..7475e8146203b9f75ea01247eb456209ed7b7c13:/contrib/samples/mmedia/Makefile.in

diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
index 9d523ec544..3d4d822595 100644
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -15,10 +15,12 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_ESD = @EXTRALIBS_ESD@
 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@
@@ -41,7 +43,7 @@ MMBOARD_OBJECTS =  \
 	mmboard_mmboard.o \
 	mmboard_mmbman.o \
 	$(__mmboard___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -77,7 +79,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 -i $(srcdir)/../../include -o \
-	mmboard$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+	mmboard$(EXEEXT) Carbon.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 = \
@@ -94,6 +96,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C mmboard$(EXEEXT)
+COND_PLATFORM_OS2_1___mmboard___os2_emxbindcmd = $(NM) mmboard$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep mmboard$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__mmboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mmboard___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__mmboard___win32rc = mmboard_mmboard_rc.o
 @COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle
 
@@ -115,12 +120,13 @@ install: all
 install-strip: install
 
 mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
-	$(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-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 $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)  $(EXTRALIBS_ESD) $(__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)
 	$(__mmboard___mac_rezcmd)
 	$(__mmboard___mac_setfilecmd)
+	$(__mmboard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p mmboard.app/Contents
 	mkdir -p mmboard.app/Contents/MacOS
 	mkdir -p mmboard.app/Contents/Resources
@@ -138,7 +144,7 @@ mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mmboard.app/Contents/Resources/mmboard.rsrc
+	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc mmboard.app/Contents/Resources/mmboard.rsrc
 	ln -f $(top_srcdir)/src/mac/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mmboard_bundle: mmboard.app/Contents/PkgInfo
@@ -150,7 +156,7 @@ mmboard_mmboard.o: $(srcdir)/mmboard.cpp
 	$(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $<
 
 mmboard_mmboard_rc.o: $(srcdir)/mmboard.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: