Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

[wxWidgets.git] / samples / mediaplayer / Makefile.in

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 93e7364d2491370cff097e7446c5b02bf017cd8e..25f852c1b458e92747b3bf4c2b47575660fb10e4 100644 (file)
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
        $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o mediaplayer$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -155,7 +154,7 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
        $(__mediaplayer___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p mediaplayer.app/Contents
        mkdir -p mediaplayer.app/Contents/MacOS
        mkdir -p mediaplayer.app/Contents/Resources
@@ -173,7 +172,6 @@ mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/car
        ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mediaplayer.app/Contents/Resources/mediaplayer.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)