X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8352927820b19e33819f38f5f5d6a905d9d6d44..8ece421c6c40b0977dc2a7f91f9eff7234b814dd:/demos/forty/Makefile.in diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 65afd69412..46bb7b5ce7 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -81,28 +80,20 @@ FORTY_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__forty___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C forty$(EXEEXT) -@COND_PLATFORM_MAC_1@__forty___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL forty$(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___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep forty$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___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@__forty_os2_lib_res = \ @@ -110,10 +101,16 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q @COND_PLATFORM_MACOSX_1@__forty_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = forty.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle -@COND_TOOLKIT_COCOA@____forty_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ $(__forty_app_Contents_PkgInfo___depname) @COND_TOOLKIT_MAC@____forty_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@ $(__forty_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_CARBON@____forty_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_CARBON@ = $(__forty_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_COCOA@____forty_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_COCOA@ = $(__forty_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_IPHONE@____forty_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_IPHONE@ = $(__forty_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_COCOA@____forty_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ $(__forty_app_Contents_PkgInfo___depname) COND_MONOLITHIC_0___WXLIB_HTML_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) @@ -149,12 +146,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 \ - forty$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -177,12 +168,12 @@ distclean: clean forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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) - $(__forty___mac_rezcmd) + $(__forty___mac_setfilecmd) $(__forty___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p forty.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p forty.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p forty.app/Contents/Resources @@ -191,7 +182,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) @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/forty/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >forty.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >forty.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >forty.app/Contents/PkgInfo @@ -200,7 +191,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP) @@ -244,6 +235,15 @@ forty_forty_rc.o: $(srcdir)/forty.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