X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8352927820b19e33819f38f5f5d6a905d9d6d44..41f6f17d01562aa09bdbcc6b02241b62f1d06b75:/samples/stc/Makefile.in diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index b9609252d8..5723f6475e 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/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,28 +71,20 @@ STCTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__stctest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT) -@COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL stctest$(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___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep stctest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___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@__stctest_os2_lib_res = \ @@ -101,10 +92,14 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \ @COND_PLATFORM_MACOSX_1@__stctest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = stctest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle +@COND_TOOLKIT_OSX_CARBON@____stctest_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_CARBON@ = $(__stctest_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_COCOA@____stctest_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_COCOA@ = $(__stctest_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_IPHONE@____stctest_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_IPHONE@ = $(__stctest_app_Contents_PkgInfo___depname) @COND_TOOLKIT_COCOA@____stctest_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_COCOA@ $(__stctest_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_MAC@____stctest_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ $(__stctest_app_Contents_PkgInfo___depname) COND_MONOLITHIC_0___WXLIB_STC_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_STC_p = $(COND_MONOLITHIC_0___WXLIB_STC_p) @@ -134,12 +129,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 \ - stctest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -162,12 +151,12 @@ distclean: clean stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__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) - $(__stctest___mac_rezcmd) + $(__stctest___mac_setfilecmd) $(__stctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p stctest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p stctest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p stctest.app/Contents/Resources @@ -176,7 +165,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___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/stctest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >stctest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >stctest.app/Contents/PkgInfo @@ -185,7 +174,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP) @@ -214,6 +203,15 @@ stctest_sample_rc.o: $(srcdir)/../sample.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