]> git.saurik.com Git - wxWidgets.git/blobdiff - contrib/samples/foldbar/extended/Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cleanup - reformatting
[wxWidgets.git] / contrib / samples / foldbar / extended / Makefile.in
diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in
index 0438b37672da31b22038df643bc6bf9adf85b9a9..b76edb0da04158934b688b7fa82c3d0e63b46b9c 100644 (file)
--- a/contrib/samples/foldbar/extended/Makefile.in
+++ b/contrib/samples/foldbar/extended/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,7 +11,8 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@
@@ -26,8 +27,10 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_XML = @EXTRALIBS_XML@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -37,8 +40,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).5
+WX_RELEASE = 2.7
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -86,6 +89,10 @@ EXTENDED_OBJECTS =  \
 COND_PLATFORM_OS2_1___extended___os2_emxbindcmd = $(NM) extended$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep extended$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__extended___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___extended___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@__extended_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__extended_bundle___depname = extended_bundle
@@ -96,6 +103,12 @@ COND_PLATFORM_OS2_1___extended___os2_emxbindcmd = $(NM) extended$(EXEEXT) | if \
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
+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)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
 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)
@@ -124,12 +137,11 @@ 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 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
+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 -i $(top_srcdir)/include -i \
-       $(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       $(srcdir)/../../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
+       $(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -152,13 +164,13 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 extended$(EXEEXT): $(EXTENDED_OBJECTS) $(__extended___win32rc)
-       $(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
+       $(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
        $(__extended___mac_rezcmd)
        $(__extended___mac_setfilecmd)
        $(__extended___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p extended.app/Contents
        mkdir -p extended.app/Contents/MacOS
        mkdir -p extended.app/Contents/Resources
@@ -176,7 +188,6 @@ extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f extended$(EXEEXT) extended.app/Contents/MacOS/extended
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc extended.app/Contents/Resources/extended.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns extended.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@extended_bundle: $(____extended_BUNDLE_TGT_REF_DEP)
@@ -185,7 +196,7 @@ extended_extended.o: $(srcdir)/extended.cpp
        $(CXXC) -c -o $@ $(EXTENDED_CXXFLAGS) $(srcdir)/extended.cpp
 
 extended_extended_rc.o: $(srcdir)/extended.rc
-       $(RESCOMP) -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 --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
+       $(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 --include-dir $(srcdir)/../../../include
 
 
 # Include dependency info, if present:
wxWidgets (Impactor)