X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17e75d3fa72a08e2af5d11a7c287fd990c8d648f..fe21801d4a3d44c86c5e0e142d77246837a83105:/samples/mediaplayer/Makefile.in

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 0741b9144c..61ab38f140 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
-REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
@@ -71,29 +70,21 @@ MEDIAPLAYER_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_0@__mediaplayer___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__mediaplayer___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C mediaplayer$(EXEEXT)
-@COND_PLATFORM_MAC_1@__mediaplayer___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL mediaplayer$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
 @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
 @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
 	mediaplayer$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
 	mediaplayer$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__mediaplayer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o
@@ -102,10 +93,16 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_MACOSX_1@__mediaplayer_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@	= mediaplayer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mediaplayer_bundle___depname = mediaplayer_bundle
+@COND_TOOLKIT_OSX_CARBON@____mediaplayer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@	= \
+@COND_TOOLKIT_OSX_CARBON@	$(__mediaplayer_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____mediaplayer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@	= $(__mediaplayer_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____mediaplayer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@	= \
+@COND_TOOLKIT_OSX_IPHONE@	$(__mediaplayer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____mediaplayer_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_COCOA@	= $(__mediaplayer_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	$(__mediaplayer_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
@@ -134,12 +131,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -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 $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
-	mediaplayer$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 
@@ -162,7 +153,7 @@ distclean: clean
 
 mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
 	$(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-	$(__mediaplayer___mac_rezcmd)
+	
 	$(__mediaplayer___mac_setfilecmd)
 	$(__mediaplayer___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
@@ -196,6 +187,15 @@ mediaplayer_mediaplayer.o: $(srcdir)/mediaplayer.cpp
 	$(CXXC) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(srcdir)/mediaplayer.cpp
 
 
+$(srcdir)/include/wx/stc/stc.h: \
+$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+$(srcdir)/src/stc/stc.cpp.in \
+$(srcdir)/src/stc/stc.h.in \
+$(srcdir)/src/stc/gen_iface.py
+	cd $(srcdir)/src/stc && ./gen_iface.py
+monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+$(srcdir)/include/wx/stc/stc.h
+
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d