basic UDP support (patch 835128)

[wxWidgets.git] / contrib / samples / mmedia / Makefile.in

diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
index 5197265dca6627ce99764df0b0814a46144f6fee..3360332d5eece6f74448f1c537498e78670b9929 100644 (file)
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,7 +36,7 @@ EXTRALIBS_ESD = @EXTRALIBS_ESD@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
@@ -73,6 +73,10 @@ COND_PLATFORM_OS2_1___mmboard___os2_emxbindcmd = $(NM) mmboard$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__mmboard_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle
+@COND_TOOLKIT_COCOA@____mmboard_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   mmboard.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____mmboard_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     mmboard.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -96,14 +100,14 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../include -o mmboard$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -132,7 +136,7 @@ mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
        $(__mmboard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-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
+mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p mmboard.app/Contents
        mkdir -p mmboard.app/Contents/MacOS
        mkdir -p mmboard.app/Contents/Resources
@@ -141,7 +145,7 @@ mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/mmboard/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >mmboard.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >mmboard.app/Contents/Info.plist
        
        
        echo -n "APPL????" >mmboard.app/Contents/PkgInfo
@@ -150,10 +154,10 @@ mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc mmboard.app/Contents/Resources/mmboard.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc mmboard.app/Contents/Resources/mmboard.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@mmboard_bundle: mmboard.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@mmboard_bundle: $(____mmboard_BUNDLE_TGT_REF_DEP)
 
 mmboard_mmboard.o: $(srcdir)/mmboard.cpp
        $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $<