]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/aui/Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
RCS-IDs
[wxWidgets.git] / samples / aui / Makefile.in
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index e67d7489b77d6714411dab6016b8405ba8cc1cdc..40996e1871a20137039169d213703614137ce7b6 100644 (file)
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
-REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
 SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
@@ -74,28 +73,20 @@ AUIDEMO_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_0@__auidemo___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__auidemo___mac_setfilecmd = \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_0@__auidemo___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__auidemo___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C auidemo$(EXEEXT)
-@COND_PLATFORM_MAC_1@__auidemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL auidemo$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @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_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_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_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_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___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd)
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___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@__auidemo___win32rc = auidemo_sample_rc.o
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_WIN32_1@__auidemo___win32rc = auidemo_sample_rc.o
@@ -104,10 +95,16 @@ COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__auidemo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = auidemo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle
 @COND_PLATFORM_MACOSX_1@__auidemo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = auidemo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle
-@COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   $(__auidemo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__auidemo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____auidemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____auidemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____auidemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__auidemo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_AUI_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
 COND_MONOLITHIC_0___WXLIB_AUI_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
@@ -145,12 +142,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_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 \
-       auidemo$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 
 
 ### Targets: ###
 
@@ -173,7 +164,7 @@ distclean: clean
 
 auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
        $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
 
 auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
        $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
-       $(__auidemo___mac_rezcmd)
+       
        $(__auidemo___mac_setfilecmd)
        $(__auidemo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
        $(__auidemo___mac_setfilecmd)
        $(__auidemo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
@@ -207,6 +198,15 @@ auidemo_auidemo.o: $(srcdir)/auidemo.cpp
        $(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.cpp
 
 
        $(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
wxWidgets (Impactor)