From: Vadim Zeitlin Date: Wed, 8 Oct 2008 15:47:51 +0000 (+0000) Subject: rebaked makefiles with 0.2.4 (and now with forgotten files) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/03c6117e8f6c958c1bc2602132ded643fc703cbf rebaked makefiles with 0.2.4 (and now with forgotten files) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure b/configure index 43017aedf7..03c1d7a6b9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 55576 2008-09-12 20:57:41Z VZ . +# From configure.in Id: configure.in 56132 2008-10-06 19:48:52Z SC . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -818,6 +818,15 @@ COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 +COND_BUILD_debug +COND_BUILD_debug_DEBUG_FLAG_default +COND_BUILD_debug_DEBUG_INFO_default +COND_BUILD_debug_UNICODE_0 +COND_BUILD_debug_UNICODE_1 +COND_BUILD_release +COND_BUILD_release_DEBUG_INFO_default +COND_BUILD_release_UNICODE_0 +COND_BUILD_release_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 @@ -891,13 +900,13 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN -COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN -COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN +COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin +COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin +COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_SHARED_0_USE_STC_1 -COND_SHARED_0_WXUSE_EXPAT_BUILTIN -COND_SHARED_0_WXUSE_REGEX_BUILTIN -COND_SHARED_0_WXUSE_ZLIB_BUILTIN +COND_SHARED_0_wxUSE_EXPAT_builtin +COND_SHARED_0_wxUSE_REGEX_builtin +COND_SHARED_0_wxUSE_ZLIB_builtin COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_ @@ -911,7 +920,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 -COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 @@ -952,6 +960,9 @@ COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN +COND_USE_GUI_1_wxUSE_LIBJPEG_builtin +COND_USE_GUI_1_wxUSE_LIBPNG_builtin +COND_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 @@ -976,6 +987,12 @@ COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN +COND_wxUSE_EXPAT_builtin +COND_wxUSE_LIBJPEG_builtin +COND_wxUSE_LIBPNG_builtin +COND_wxUSE_LIBTIFF_builtin +COND_wxUSE_REGEX_builtin +COND_wxUSE_ZLIB_builtin DEREZ SHARED WX_LIBRARY_BASENAME_NOGUI @@ -33085,7 +33102,7 @@ if test "$wxUSE_OPENGL" = "yes"; then { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} wxUSE_OPENGL="no" - elif test "$wxUSE_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then + elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" @@ -49289,7 +49306,7 @@ fi BAKEFILE_BAKEFILE_M4_VERSION="0.2.3" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.4" @@ -49550,6 +49567,51 @@ EOF COND_BUILD_RELEASE_UNICODE_1="" fi + COND_BUILD_debug="#" + if test "x$BUILD" = "xdebug" ; then + COND_BUILD_debug="" + fi + + COND_BUILD_debug_DEBUG_FLAG_default="#" + if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then + COND_BUILD_debug_DEBUG_FLAG_default="" + fi + + COND_BUILD_debug_DEBUG_INFO_default="#" + if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then + COND_BUILD_debug_DEBUG_INFO_default="" + fi + + COND_BUILD_debug_UNICODE_0="#" + if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then + COND_BUILD_debug_UNICODE_0="" + fi + + COND_BUILD_debug_UNICODE_1="#" + if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then + COND_BUILD_debug_UNICODE_1="" + fi + + COND_BUILD_release="#" + if test "x$BUILD" = "xrelease" ; then + COND_BUILD_release="" + fi + + COND_BUILD_release_DEBUG_INFO_default="#" + if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then + COND_BUILD_release_DEBUG_INFO_default="" + fi + + COND_BUILD_release_UNICODE_0="#" + if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then + COND_BUILD_release_UNICODE_0="" + fi + + COND_BUILD_release_UNICODE_1="#" + if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then + COND_BUILD_release_UNICODE_1="" + fi + COND_DEBUG_FLAG_1="#" if test "x$DEBUG_FLAG" = "x1" ; then COND_DEBUG_FLAG_1="" @@ -49915,19 +49977,19 @@ EOF COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" fi - COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="" fi - COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="" fi - COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="" fi COND_SHARED_0_USE_STC_1="#" @@ -49935,19 +49997,19 @@ EOF COND_SHARED_0_USE_STC_1="" fi - COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#" + COND_SHARED_0_wxUSE_EXPAT_builtin="#" if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_EXPAT_BUILTIN="" + COND_SHARED_0_wxUSE_EXPAT_builtin="" fi - COND_SHARED_0_WXUSE_REGEX_BUILTIN="#" + COND_SHARED_0_wxUSE_REGEX_builtin="#" if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_REGEX_BUILTIN="" + COND_SHARED_0_wxUSE_REGEX_builtin="" fi - COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#" + COND_SHARED_0_wxUSE_ZLIB_builtin="#" if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_ZLIB_BUILTIN="" + COND_SHARED_0_wxUSE_ZLIB_builtin="" fi COND_SHARED_1="#" @@ -50015,11 +50077,6 @@ EOF COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#" - if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="" - fi - COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="" @@ -50220,6 +50277,21 @@ EOF COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi + COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="" + fi + + COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_USE_GUI_1_wxUSE_LIBPNG_builtin="" + fi + + COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="" + fi + COND_USE_OPENGL_1="#" if test "x$USE_OPENGL" = "x1" ; then COND_USE_OPENGL_1="" @@ -50340,6 +50412,36 @@ EOF COND_WXUSE_ZLIB_BUILTIN="" fi + COND_wxUSE_EXPAT_builtin="#" + if test "x$wxUSE_EXPAT" = "xbuiltin" ; then + COND_wxUSE_EXPAT_builtin="" + fi + + COND_wxUSE_LIBJPEG_builtin="#" + if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_wxUSE_LIBJPEG_builtin="" + fi + + COND_wxUSE_LIBPNG_builtin="#" + if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_wxUSE_LIBPNG_builtin="" + fi + + COND_wxUSE_LIBTIFF_builtin="#" + if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_wxUSE_LIBTIFF_builtin="" + fi + + COND_wxUSE_REGEX_builtin="#" + if test "x$wxUSE_REGEX" = "xbuiltin" ; then + COND_wxUSE_REGEX_builtin="" + fi + + COND_wxUSE_ZLIB_builtin="#" + if test "x$wxUSE_ZLIB" = "xbuiltin" ; then + COND_wxUSE_ZLIB_builtin="" + fi + if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then @@ -51752,6 +51854,15 @@ COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim +COND_BUILD_debug!$COND_BUILD_debug$ac_delim +COND_BUILD_debug_DEBUG_FLAG_default!$COND_BUILD_debug_DEBUG_FLAG_default$ac_delim +COND_BUILD_debug_DEBUG_INFO_default!$COND_BUILD_debug_DEBUG_INFO_default$ac_delim +COND_BUILD_debug_UNICODE_0!$COND_BUILD_debug_UNICODE_0$ac_delim +COND_BUILD_debug_UNICODE_1!$COND_BUILD_debug_UNICODE_1$ac_delim +COND_BUILD_release!$COND_BUILD_release$ac_delim +COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim +COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim +COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim @@ -51825,22 +51936,13 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim -COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim -COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim -COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim -COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim -COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim -COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim -COND_SHARED_1!$COND_SHARED_1$ac_delim -COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim -COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim -COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim -COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim -COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim -COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim -COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim -COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim +COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim +COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim +COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51882,11 +51984,19 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_SHARED_1!$COND_SHARED_1$ac_delim +COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim +COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim +COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim +COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim +COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim +COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim +COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim @@ -51927,6 +52037,9 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim +COND_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim +COND_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim +COND_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim @@ -51951,6 +52064,12 @@ COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim +COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim +COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim +COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim +COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim +COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim +COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim DEREZ!$DEREZ$ac_delim SHARED!$SHARED$ac_delim WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim @@ -51962,23 +52081,6 @@ TOOLKIT!$TOOLKIT$ac_delim TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim -cross_compiling!$cross_compiling$ac_delim -WIDGET_SET!$WIDGET_SET$ac_delim -WX_RELEASE!$WX_RELEASE$ac_delim -WX_VERSION!$WX_VERSION$ac_delim -WX_SUBVERSION!$WX_SUBVERSION$ac_delim -WX_CHARTYPE!$WX_CHARTYPE$ac_delim -WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim -WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim -WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim -WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim -WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim -WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim -WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim -WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim -GUIDIST!$GUIDIST$ac_delim -DISTDIR!$DISTDIR$ac_delim -SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52020,6 +52122,23 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +cross_compiling!$cross_compiling$ac_delim +WIDGET_SET!$WIDGET_SET$ac_delim +WX_RELEASE!$WX_RELEASE$ac_delim +WX_VERSION!$WX_VERSION$ac_delim +WX_SUBVERSION!$WX_SUBVERSION$ac_delim +WX_CHARTYPE!$WX_CHARTYPE$ac_delim +WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim +WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim +WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim +WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim +WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim +WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim +WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim +WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim +GUIDIST!$GUIDIST$ac_delim +DISTDIR!$DISTDIR$ac_delim +SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim LDFLAGS_GL!$LDFLAGS_GL$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim @@ -52039,7 +52158,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/demos/Makefile.in b/demos/Makefile.in index b558183666..1eb0a6ec1d 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -23,7 +23,7 @@ DESTDIR = all: bombs forty fractal life poem -install: all +install: uninstall: diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 3d790061dc..d853df8430 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -61,7 +61,7 @@ BOMBS_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -112,28 +112,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: bombs$(EXEEXT) $(__bombs_bundle___depname) -install: all +install: uninstall: @@ -149,7 +149,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile 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) + $(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__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) $(LIBS) $(__bombs___mac_setfilecmd) $(__bombs___os2_emxbindcmd) @@ -200,6 +200,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean bombs_bundle diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj index 2fa782e008..9c4738c6b0 100644 --- a/demos/bombs/bombs_vc7.vcproj +++ b/demos/bombs/bombs_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\bombs" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,21 +523,25 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\bombs.cpp"> + + RelativePath=".\bombs1.cpp"> + + RelativePath=".\game.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\bombs.rc"> + diff --git a/demos/bombs/bombs_vc8.vcproj b/demos/bombs/bombs_vc8.vcproj index 9e1f84f0db..810d0cc423 100644 --- a/demos/bombs/bombs_vc8.vcproj +++ b/demos/bombs/bombs_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,27 +784,31 @@ + > + + > + + > + + > + diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc index 235ccc5b05..9d20408f3b 100644 --- a/demos/bombs/makefile.bcc +++ b/demos/bombs/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -231,7 +231,7 @@ clean: -if exist $(OBJS)\bombs.ils del $(OBJS)\bombs.ils $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res | diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc index 2708e09338..ef96e89ea9 100644 --- a/demos/bombs/makefile.gcc +++ b/demos/bombs/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -226,7 +226,7 @@ clean: -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o - $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BOMBS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\bombs_bombs.o: ./bombs.cpp $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $< diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index ad7fadcbc7..e3ceb24862 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -54,18 +54,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -75,18 +75,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -307,7 +307,7 @@ clean: -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(BOMBS_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index 4972ec0648..03a1b2cf7e 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -253,7 +253,7 @@ $(OBJS)\bombs.exe : $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res @%append $(OBJS)\bombs.lbc option quiet @%append $(OBJS)\bombs.lbc name $^@ @%append $(OBJS)\bombs.lbc option caseexact - @%append $(OBJS)\bombs.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\bombs.lbc library %i @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 46bb7b5ce7..a7fa8c9db0 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -70,7 +70,7 @@ FORTY_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -130,28 +130,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: forty$(EXEEXT) $(__forty_bundle___depname) data -install: all +install: uninstall: @@ -167,7 +167,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile 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) + $(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__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) $(LIBS) $(__forty___mac_setfilecmd) $(__forty___os2_emxbindcmd) @@ -245,6 +245,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean forty_bundle data diff --git a/demos/forty/forty_vc7.vcproj b/demos/forty/forty_vc7.vcproj index 5ebc653132..d2bbb4058f 100644 --- a/demos/forty/forty_vc7.vcproj +++ b/demos/forty/forty_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\forty" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,31 +523,40 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\canvas.cpp"> + + RelativePath=".\card.cpp"> + + RelativePath=".\forty.cpp"> + + RelativePath=".\game.cpp"> + + RelativePath=".\pile.cpp"> + + RelativePath=".\playerdg.cpp"> + + RelativePath=".\scoredg.cpp"> + + RelativePath=".\scorefil.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\forty.rc"> + diff --git a/demos/forty/forty_vc8.vcproj b/demos/forty/forty_vc8.vcproj index cbc3812e23..1340c110e9 100644 --- a/demos/forty/forty_vc8.vcproj +++ b/demos/forty/forty_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,42 +784,51 @@ + > + + > + + > + + > + + > + + > + + > + + > + + > + diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc index 96b5d1b3b5..dc2aed0750 100644 --- a/demos/forty/makefile.bcc +++ b/demos/forty/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -248,7 +248,7 @@ clean: -if exist $(OBJS)\forty.ils del $(OBJS)\forty.ils $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res | diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc index c8fd3db588..016e9c5a72 100644 --- a/demos/forty/makefile.gcc +++ b/demos/forty/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -243,7 +243,7 @@ clean: -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o - $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 2a4a819098..7e942c6238 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -59,18 +59,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -80,18 +80,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FORTY_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index e0649b21be..f18bd0f472 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -273,7 +273,7 @@ $(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res @%append $(OBJS)\forty.lbc option quiet @%append $(OBJS)\forty.lbc name $^@ @%append $(OBJS)\forty.lbc option caseexact - @%append $(OBJS)\forty.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\forty.lbc library %i @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 8b534aac8e..bbc3248965 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -59,7 +59,7 @@ FRACTAL_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: fractal$(EXEEXT) $(__fractal_bundle___depname) -install: all +install: uninstall: @@ -147,7 +147,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) - $(CXX) -o $@ $(FRACTAL_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) + $(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__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) $(LIBS) $(__fractal___mac_setfilecmd) $(__fractal___os2_emxbindcmd) @@ -192,6 +192,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean fractal_bundle diff --git a/demos/fractal/fractal_vc7.vcproj b/demos/fractal/fractal_vc7.vcproj index 57a8348120..42626d75ec 100644 --- a/demos/fractal/fractal_vc7.vcproj +++ b/demos/fractal/fractal_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\fractal" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,17 +523,19 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\fractal.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\fractal.rc"> + diff --git a/demos/fractal/fractal_vc8.vcproj b/demos/fractal/fractal_vc8.vcproj index ead64194d0..62a4f03a5b 100644 --- a/demos/fractal/fractal_vc8.vcproj +++ b/demos/fractal/fractal_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,21 +784,23 @@ + > + + > + diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc index 6b21778c54..973c6f91ad 100644 --- a/demos/fractal/makefile.bcc +++ b/demos/fractal/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\fractal.ils del $(OBJS)\fractal.ils $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res | diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc index 185af559b2..4ec493a285 100644 --- a/demos/fractal/makefile.gcc +++ b/demos/fractal/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o - $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(FRACTAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\fractal_fractal.o: ./fractal.cpp $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $< diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 4a05909b03..a16e28c8c9 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -52,18 +52,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FRACTAL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index 37012cccdb..9d3de98b18 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -251,7 +251,7 @@ $(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res @%append $(OBJS)\fractal.lbc option quiet @%append $(OBJS)\fractal.lbc name $^@ @%append $(OBJS)\fractal.lbc option caseexact - @%append $(OBJS)\fractal.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\fractal.lbc library %i @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index a505559d2f..c0e4973a75 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -62,7 +62,7 @@ LIFE_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -113,28 +113,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: life$(EXEEXT) $(__life_bundle___depname) data -install: all +install: uninstall: @@ -150,7 +150,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc) - $(CXX) -o $@ $(LIFE_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) + $(CXX) -o $@ $(LIFE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__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) $(LIBS) $(__life___mac_setfilecmd) $(__life___os2_emxbindcmd) @@ -216,6 +216,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean life_bundle data diff --git a/demos/life/life_vc7.vcproj b/demos/life/life_vc7.vcproj index 438e25f92b..85b31d959a 100644 --- a/demos/life/life_vc7.vcproj +++ b/demos/life/life_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\life" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,23 +523,28 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\dialogs.cpp"> + + RelativePath=".\game.cpp"> + + RelativePath=".\life.cpp"> + + RelativePath=".\reader.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\life.rc"> + diff --git a/demos/life/life_vc8.vcproj b/demos/life/life_vc8.vcproj index c7da563236..6f1d019698 100644 --- a/demos/life/life_vc8.vcproj +++ b/demos/life/life_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,30 +784,35 @@ + > + + > + + > + + > + + > + diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc index 471e873881..9bef3a2f45 100644 --- a/demos/life/makefile.bcc +++ b/demos/life/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\life.ils del $(OBJS)\life.ils $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res | diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc index cc796d5597..2a993168aa 100644 --- a/demos/life/makefile.gcc +++ b/demos/life/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -227,7 +227,7 @@ clean: -if exist $(OBJS)\life.exe del $(OBJS)\life.exe $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o - $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(LIFE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index 28c427dde4..db745ffa05 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -55,18 +55,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -76,18 +76,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -308,7 +308,7 @@ clean: -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LIFE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat index eb99c4259b..7723087314 100644 --- a/demos/life/makefile.wat +++ b/demos/life/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -254,7 +254,7 @@ $(OBJS)\life.exe : $(LIFE_OBJECTS) $(OBJS)\life_life.res @%append $(OBJS)\life.lbc option quiet @%append $(OBJS)\life.lbc name $^@ @%append $(OBJS)\life.lbc option caseexact - @%append $(OBJS)\life.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\life.lbc library %i @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res diff --git a/demos/makefile.bcc b/demos/makefile.bcc index ac1204e5fd..bdfcd0d229 100644 --- a/demos/makefile.bcc +++ b/demos/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_PROPGRID="$(USE_PROPGRID)" \ + -DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \ + -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ diff --git a/demos/makefile.gcc b/demos/makefile.gcc index a771269649..fec06fa014 100644 --- a/demos/makefile.gcc +++ b/demos/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \ + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ diff --git a/demos/makefile.vc b/demos/makefile.vc index b8341f7221..98667fc5b5 100644 --- a/demos/makefile.vc +++ b/demos/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \ + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ diff --git a/demos/makefile.wat b/demos/makefile.wat index d2151e2d6d..e8c44b0590 100644 --- a/demos/makefile.wat +++ b/demos/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" & + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index cdbbc272cb..220f1d6045 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -60,7 +60,7 @@ WXPOEM_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -114,28 +114,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data -install: all +install: uninstall: @@ -151,7 +151,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) - $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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) + $(CXX) -o $@ $(WXPOEM_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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) $(LIBS) $(__wxpoem___mac_setfilecmd) $(__wxpoem___os2_emxbindcmd) @@ -208,6 +208,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean wxpoem_bundle data diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc index 9a9cf65d72..e6877a4433 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res | diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index aa9ac2b36b..56809f278b 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o - $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXPOEM_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 7bf3925f54..7bc638fd6a 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -52,18 +52,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WXPOEM_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 50e4cf3e4c..5a6f72404e 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -256,7 +256,7 @@ $(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res @%append $(OBJS)\wxpoem.lbc option quiet @%append $(OBJS)\wxpoem.lbc name $^@ @%append $(OBJS)\wxpoem.lbc option caseexact - @%append $(OBJS)\wxpoem.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxpoem.lbc library %i @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res diff --git a/demos/poem/poem_vc7.vcproj b/demos/poem/poem_vc7.vcproj index d6f82b7cd0..576fad4165 100644 --- a/demos/poem/poem_vc7.vcproj +++ b/demos/poem/poem_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\wxpoem" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,17 +523,19 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\wxpoem.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\wxpoem.rc"> + diff --git a/demos/poem/poem_vc8.vcproj b/demos/poem/poem_vc8.vcproj index 66936e8a70..9bf48852d8 100644 --- a/demos/poem/poem_vc8.vcproj +++ b/demos/poem/poem_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,21 +784,23 @@ + > + + > + diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 6d96a3859f..9ae7b3f559 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -56,7 +56,7 @@ WXEMULATOR_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -94,28 +94,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: wxemulator$(EXEEXT) data -install: all +install: uninstall: @@ -130,7 +130,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc) - $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(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) + $(CXX) -o $@ $(WXEMULATOR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS) $(__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) $(LIBS) $(__wxemulator___mac_setfilecmd) $(__wxemulator___os2_emxbindcmd) @@ -164,6 +164,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean data diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj index 89013183f9..0ed8af58b4 100644 --- a/utils/emulator/src/emulator_vc7.vcproj +++ b/utils/emulator/src/emulator_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\wxemulator" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,17 +523,19 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\emulator.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\..\..\..\samples\sample.rc"> + diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj index 866e9ca544..399ed708ea 100644 --- a/utils/emulator/src/emulator_vc8.vcproj +++ b/utils/emulator/src/emulator_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,21 +784,23 @@ + > + + > + diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc index 3800a32360..569fa6edcb 100644 --- a/utils/emulator/src/makefile.bcc +++ b/utils/emulator/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res | diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index f2cfeb308c..1f5c5dc102 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o - $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index 8a8084329b..c1f18ec48c 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -52,18 +52,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WXEMULATOR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index 5ca3799d6f..b1567e1b19 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -251,7 +251,7 @@ $(OBJS)\wxemulator.exe : $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res @%append $(OBJS)\wxemulator.lbc option quiet @%append $(OBJS)\wxemulator.lbc name $^@ @%append $(OBJS)\wxemulator.lbc option caseexact - @%append $(OBJS)\wxemulator.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wxemulator.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxemulator.lbc library %i @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 90730f2324..a274c9515f 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -64,7 +64,7 @@ HELPVIEW_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -121,28 +121,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: helpview$(EXEEXT) $(__helpview_bundle___depname) data -install: all install_helpview +install: install_helpview uninstall: uninstall_helpview @@ -159,7 +159,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) + $(CXX) -o $@ $(HELPVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_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) $(LIBS) $(__helpview___mac_setfilecmd) $(__helpview___os2_emxbindcmd) @@ -187,7 +187,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP) -install_helpview: +install_helpview: helpview$(EXEEXT) $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) helpview$(EXEEXT) $(DESTDIR)$(bindir) @@ -223,6 +223,7 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean helpview_bundle install_helpview uninstall_helpview data +.PHONY: all install uninstall clean distclean helpview_bundle install_helpview \ + uninstall_helpview data diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj index a1df24157f..b802427d85 100644 --- a/utils/helpview/src/helpview_vc7.vcproj +++ b/utils/helpview/src/helpview_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\helpview" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,17 +523,19 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\helpview.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\helpview.rc"> + diff --git a/utils/helpview/src/helpview_vc8.vcproj b/utils/helpview/src/helpview_vc8.vcproj index 5b7c40bb0d..4d2e872b1e 100644 --- a/utils/helpview/src/helpview_vc8.vcproj +++ b/utils/helpview/src/helpview_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,21 +784,23 @@ + > + + > + diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc index 4daf8bb5bd..3c67551ab3 100644 --- a/utils/helpview/src/makefile.bcc +++ b/utils/helpview/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -237,7 +237,7 @@ clean: -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res | diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc index 568207ab3c..1281e18d6e 100644 --- a/utils/helpview/src/makefile.gcc +++ b/utils/helpview/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 41af78fc56..da8e0e3b93 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -52,18 +52,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -313,7 +313,7 @@ clean: -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HELPVIEW_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat index 94ad241260..c55b4316af 100644 --- a/utils/helpview/src/makefile.wat +++ b/utils/helpview/src/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -261,7 +261,7 @@ $(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\helpview.lbc library %i @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index 5f14037ac2..a4f4197443 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -61,7 +61,7 @@ HHP2CACHED_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -102,28 +102,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ +@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: hhp2cached$(EXEEXT) -install: all install_hhp2cached +install: install_hhp2cached uninstall: uninstall_hhp2cached @@ -139,12 +139,12 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc) - $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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) + $(CXX) -o $@ $(HHP2CACHED_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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) $(LIBS) $(__hhp2cached___mac_setfilecmd) $(__hhp2cached___os2_emxbindcmd) -install_hhp2cached: +install_hhp2cached: hhp2cached$(EXEEXT) $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) hhp2cached$(EXEEXT) $(DESTDIR)$(bindir) @@ -168,6 +168,7 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean install_hhp2cached uninstall_hhp2cached +.PHONY: all install uninstall clean distclean install_hhp2cached \ + uninstall_hhp2cached diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj index c1a73a97ae..aca61eb002 100644 --- a/utils/hhp2cached/hhp2cached_vc7.vcproj +++ b/utils/hhp2cached/hhp2cached_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\hhp2cached" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,17 +523,19 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\hhp2cached.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\hhp2cached.rc"> + diff --git a/utils/hhp2cached/hhp2cached_vc8.vcproj b/utils/hhp2cached/hhp2cached_vc8.vcproj index 246a4610e7..982eaf293a 100644 --- a/utils/hhp2cached/hhp2cached_vc8.vcproj +++ b/utils/hhp2cached/hhp2cached_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,21 +784,23 @@ + > + + > + diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc index 7e7002eb44..2efefa3d70 100644 --- a/utils/hhp2cached/makefile.bcc +++ b/utils/hhp2cached/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res | diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc index 21e25b74aa..3978d58b90 100644 --- a/utils/hhp2cached/makefile.gcc +++ b/utils/hhp2cached/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o - $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $< diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index f753e8dfc5..738313231e 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -52,18 +52,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HHP2CACHED_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index abb040068b..6069a7ff78 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -256,7 +256,7 @@ $(OBJS)\hhp2cached.exe : $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.re @%append $(OBJS)\hhp2cached.lbc option quiet @%append $(OBJS)\hhp2cached.lbc name $^@ @%append $(OBJS)\hhp2cached.lbc option caseexact - @%append $(OBJS)\hhp2cached.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\hhp2cached.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\hhp2cached.lbc library %i @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in index 7b767716b1..66ace7012b 100644 --- a/utils/ifacecheck/src/Makefile.in +++ b/utils/ifacecheck/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -56,7 +56,7 @@ IFACECHECK_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -79,19 +79,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: ifacecheck$(EXEEXT) -install: all install_ifacecheck +install: install_ifacecheck uninstall: uninstall_ifacecheck @@ -107,11 +107,11 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ifacecheck$(EXEEXT): $(IFACECHECK_OBJECTS) - $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(IFACECHECK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__ifacecheck___mac_setfilecmd) -install_ifacecheck: +install_ifacecheck: ifacecheck$(EXEEXT) $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) ifacecheck$(EXEEXT) $(DESTDIR)$(bindir) @@ -135,6 +135,7 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean install_ifacecheck uninstall_ifacecheck +.PHONY: all install uninstall clean distclean install_ifacecheck \ + uninstall_ifacecheck diff --git a/utils/ifacecheck/src/ifacecheck.dsp b/utils/ifacecheck/src/ifacecheck.dsp index 6aa77cdf89..ddaa895b50 100644 --- a/utils/ifacecheck/src/ifacecheck.dsp +++ b/utils/ifacecheck/src/ifacecheck.dsp @@ -242,6 +242,14 @@ SOURCE=.\ifacecheck.cpp SOURCE=.\xmlparser.cpp # End Source File # End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xmlparser.h +# End Source File +# End Group # End Target # End Project diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj index 08746c12d4..12e43c9dcb 100644 --- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\ifacecheck" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + + + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + + + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + + + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + + + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,12 +523,22 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + + + RelativePath=".\xmlparser.cpp"> + + + + RelativePath=".\xmlparser.h"> + diff --git a/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/utils/ifacecheck/src/ifacecheck_vc8.vcproj index b958262572..f61f43bec3 100644 --- a/utils/ifacecheck/src/ifacecheck_vc8.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,15 +784,27 @@ + > + + > + + + + + diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc index 2d3eb79497..98f158819e 100644 --- a/utils/ifacecheck/src/makefile.bcc +++ b/utils/ifacecheck/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -188,7 +188,7 @@ clean: -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, | diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc index 25d7cf6d30..9ed8c3a1a7 100644 --- a/utils/ifacecheck/src/makefile.gcc +++ b/utils/ifacecheck/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -180,7 +180,7 @@ clean: -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $< diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc index a0cb600815..b771df35b6 100644 --- a/utils/ifacecheck/src/makefile.vc +++ b/utils/ifacecheck/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -52,18 +52,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -73,18 +73,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -245,7 +245,7 @@ clean: -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/ifacecheck/src/makefile.wat b/utils/ifacecheck/src/makefile.wat index b6e0f4c4e5..1cab5b6aa9 100644 --- a/utils/ifacecheck/src/makefile.wat +++ b/utils/ifacecheck/src/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -240,7 +240,7 @@ $(OBJS)\ifacecheck.exe : $(IFACECHECK_OBJECTS) @%append $(OBJS)\ifacecheck.lbc option quiet @%append $(OBJS)\ifacecheck.lbc name $^@ @%append $(OBJS)\ifacecheck.lbc option caseexact - @%append $(OBJS)\ifacecheck.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\ifacecheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\ifacecheck.lbc library %i @%append $(OBJS)\ifacecheck.lbc diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 52a5adea3f..db57d7190f 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -56,7 +56,7 @@ WXRC_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @@ -82,19 +82,19 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ +@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ +@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(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_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) ### Targets: ### all: $(__wxrc___depname) -install: all $(__install_wxrc___depname) +install: $(__install_wxrc___depname) uninstall: $(__uninstall_wxrc___depname) @@ -110,11 +110,11 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS) -@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) +@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_XRC_1@ @COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd) -@COND_USE_XRC_1@install_wxrc: +@COND_USE_XRC_1@install_wxrc: $(__wxrc___depname) @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) @@ -139,6 +139,6 @@ 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 +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean install_wxrc uninstall_wxrc diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc index b8d07a19f5..57b3d0b1dd 100644 --- a/utils/wxrc/makefile.bcc +++ b/utils/wxrc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -191,7 +191,7 @@ clean: !if "$(USE_XRC)" == "1" $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, | !endif diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc index 3a1fc32507..65976ed171 100644 --- a/utils/wxrc/makefile.gcc +++ b/utils/wxrc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -183,7 +183,7 @@ clean: ifeq ($(USE_XRC),1) $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXRC_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif $(OBJS)\wxrc_wxrc.o: ./wxrc.cpp diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index cc7c74d500..059801a938 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -51,18 +51,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" DIR_SUFFIX_CPU = _amd64 !endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(TARGET_CPU)" == "amd64" DIR_SUFFIX_CPU = _amd64 !endif !if "$(TARGET_CPU)" == "ia64" DIR_SUFFIX_CPU = _ia64 !endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -72,18 +72,18 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(TARGET_CPU)" == "amd64" +!if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:AMD64 !endif !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -248,7 +248,7 @@ clean: !if "$(USE_XRC)" == "1" $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index 8963f5e1ef..b913943389 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.4 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -243,7 +243,7 @@ $(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @%append $(OBJS)\wxrc.lbc option quiet @%append $(OBJS)\wxrc.lbc name $^@ @%append $(OBJS)\wxrc.lbc option caseexact - @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxrc.lbc library %i @%append $(OBJS)\wxrc.lbc diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj index 96f01dbbbc..705888d3a0 100644 --- a/utils/wxrc/wxrc_vc7.vcproj +++ b/utils/wxrc/wxrc_vc7.vcproj @@ -1,8 +1,8 @@ - + @@ -22,74 +22,60 @@ IntermediateDirectory="vc_mswunivudll\wxrc" ConfigurationType="1" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + + + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + Name="VCPostBuildEventTool"/> + Name="VCPreBuildEventTool"/> + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + + + Name="VCManagedWrapperGeneratorTool"/> + @@ -623,10 +523,11 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\wxrc.cpp"> + diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj index 297424344e..d2b5c90eda 100644 --- a/utils/wxrc/wxrc_vc8.vcproj +++ b/utils/wxrc/wxrc_vc8.vcproj @@ -1,8 +1,8 @@ - + @@ -43,57 +43,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -137,57 +136,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -231,57 +232,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -325,57 +325,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -419,57 +421,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -513,57 +514,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -607,57 +610,56 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -701,57 +703,59 @@ Name="VCWebServiceProxyGeneratorTool" /> + @@ -780,12 +784,13 @@ + > +