X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fce0e8f7cdd4c2a5beee4bd42db03d786d99a146..07bfacf3a6658037e38f080c04bb56783d54463a:/demos/bombs diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index fcdaec4556..3d790061dc 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,36 +71,37 @@ BOMBS_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__bombs___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C bombs$(EXEEXT) -@COND_PLATFORM_MAC_1@__bombs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bombs$(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___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep bombs$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___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_OS2_1@__bombs_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res +@COND_PLATFORM_MACOSX_1@__bombs_app_Contents_PkgInfo___depname \ +@COND_PLATFORM_MACOSX_1@ = bombs.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle +@COND_TOOLKIT_MAC@____bombs_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ $(__bombs_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_CARBON@____bombs_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_CARBON@ = $(__bombs_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_COCOA@____bombs_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_COCOA@ = $(__bombs_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_IPHONE@____bombs_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_IPHONE@ = $(__bombs_app_Contents_PkgInfo___depname) @COND_TOOLKIT_COCOA@____bombs_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ bombs.app/Contents/PkgInfo -@COND_TOOLKIT_MAC@____bombs_BUNDLE_TGT_REF_DEP = bombs.app/Contents/PkgInfo +@COND_TOOLKIT_COCOA@ $(__bombs_app_Contents_PkgInfo___depname) COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @@ -128,12 +128,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 \ - bombs$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,30 +150,30 @@ distclean: clean bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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) - $(__bombs___mac_rezcmd) + $(__bombs___mac_setfilecmd) $(__bombs___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns - mkdir -p bombs.app/Contents - mkdir -p bombs.app/Contents/MacOS - mkdir -p bombs.app/Contents/Resources - - - sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ - -e "s/EXECUTABLE/bombs/" \ - -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/carbon/Info.plist.in >bombs.app/Contents/Info.plist - - - echo -n "APPL????" >bombs.app/Contents/PkgInfo - - - ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs - - - cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@ mkdir -p bombs.app/Contents +@COND_PLATFORM_MACOSX_1@ mkdir -p bombs.app/Contents/MacOS +@COND_PLATFORM_MACOSX_1@ mkdir -p bombs.app/Contents/Resources +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/bombs/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >bombs.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >bombs.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP) @@ -196,6 +190,15 @@ bombs_bombs_rc.o: $(srcdir)/bombs.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(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