Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update version to 3.1.1

Browse Source 
Update misc/scripts/inc_release script: remove non-existent any more files and
update the version in the MSVS 200x project files not generated by bakefile
any more and MSVS 201x project files which were not previously taken into
account.

Run it and rebake.
This commit is contained in:
Vadim Zeitlin
2016-03-02 23:16:16 +01:00
parent 30393a178f
commit 7eee3576cf
126 changed files with 193 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile.in
View File

@@ -77,8 +77,8 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
$(CPPFLAGS) $(CFLAGS) $(CPPFLAGS) $(CFLAGS)
@@ -13165,7 +13165,7 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
@COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r @COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r
@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
@COND_SHARED_0@____SHARED = @COND_SHARED_0@____SHARED =
@COND_SHARED_1@____SHARED = $(PIC_FLAG) @COND_SHARED_1@____SHARED = $(PIC_FLAG)
@@ -13762,17 +13762,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).1.0.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0 @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
@@ -13970,7 +13970,7 @@ clean: $(__clean_wxrc___depname)
rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
-(cd samples && $(MAKE) clean) -(cd samples && $(MAKE) clean)
rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
distclean: clean distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -14749,13 +14749,13 @@ locale_msw_uninstall:
fi ; \ fi ; \
done done
@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: @COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r:
@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc @COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc
@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r @COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r
@COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname) @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir) @COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir)
@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) @COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir)
wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
$(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c

2
build/bakefiles/version.bkl
View File

@@ -22,7 +22,7 @@
3. Else, i.e. if there were no changes at all to API but only internal 3. Else, i.e. if there were no changes at all to API but only internal
changes, change C:R:A to C:R+1:A changes, change C:R:A to C:R+1:A
--> -->
<set var="WX_CURRENT">0</set> <set var="WX_CURRENT">1</set>
<set var="WX_REVISION">0</set> <set var="WX_REVISION">0</set>
<set var="WX_AGE">0</set> <set var="WX_AGE">0</set>

4
build/msw/makefile.bcc
View File

@@ -39,7 +39,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -5561,7 +5561,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

4
build/msw/makefile.gcc
View File

@@ -33,7 +33,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
WINDRES="$(WINDRES)" WINDRES="$(WINDRES)"
CPPDEPS = -MT$@ -MF$@.d -MD -MP CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -5736,7 +5736,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

4
build/msw/makefile.vc
View File

@@ -30,7 +30,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
@@ -6253,7 +6253,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)

2
build/msw/wx_setup.props
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<wxVersionString>310</wxVersionString> <wxVersionString>311</wxVersionString>
<wxShortVersionString>31</wxShortVersionString> <wxShortVersionString>31</wxShortVersionString>
<wxToolkitPrefix>msw</wxToolkitPrefix> <wxToolkitPrefix>msw</wxToolkitPrefix>
<wxCompilerPrefix>vc</wxCompilerPrefix> <wxCompilerPrefix>vc</wxCompilerPrefix>

2
build/osx/wxvers.xcconfig
View File

@@ -1,4 +1,4 @@
// update this file with new version numbers // update this file with new version numbers
DYLIB_COMPATIBILITY_VERSION = 3.1 DYLIB_COMPATIBILITY_VERSION = 3.1
DYLIB_CURRENT_VERSION = 3.1.0 DYLIB_CURRENT_VERSION = 3.1.1

4
configure.in
View File

@@ -14,7 +14,7 @@ dnl ---------------------------------------------------------------------------
dnl initialization dnl initialization
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_INIT([wxWidgets], [3.1.0], [wx-dev@googlegroups.com]) AC_INIT([wxWidgets], [3.1.1], [wx-dev@googlegroups.com])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in]) AC_CONFIG_SRCDIR([wx-config.in])
@@ -40,7 +40,7 @@ dnl wx_release_number += 1
wx_major_version_number=3 wx_major_version_number=3
wx_minor_version_number=1 wx_minor_version_number=1
wx_release_number=0 wx_release_number=1
wx_subrelease_number=0 wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_RELEASE=$wx_major_version_number.$wx_minor_version_number

2
demos/bombs/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
demos/forty/Makefile.in
View File

@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
demos/fractal/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
demos/life/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
demos/poem/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
docs/doxygen/Doxyfile
View File

@@ -6,7 +6,7 @@
DOXYFILE_ENCODING = UTF-8 DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = wxWidgets PROJECT_NAME = wxWidgets
PROJECT_NUMBER = 3.1.0 PROJECT_NUMBER = 3.1.1
PROJECT_BRIEF = PROJECT_BRIEF =
PROJECT_LOGO = logo.png PROJECT_LOGO = logo.png
OUTPUT_DIRECTORY = out OUTPUT_DIRECTORY = out

6
docs/readme.txt
View File

@@ -1,4 +1,4 @@
wxWidgets 3.1.0 Release Notes wxWidgets 3.1.1 Release Notes
============================= =============================
Welcome to the latest development release of wxWidgets, a free and open source Welcome to the latest development release of wxWidgets, a free and open source
@@ -16,12 +16,12 @@ more about wxWidgets at:
Documentation is available online at: Documentation is available online at:
* http://docs.wxwidgets.org/3.1.0/ * http://docs.wxwidgets.org/3.1.1/
wxWidgets sources and binaries for the selected platforms are available for wxWidgets sources and binaries for the selected platforms are available for
download from: download from:
* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.0/ * https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.1/
Changes Changes

4
include/wx/osx/config_xcode.h
View File

@@ -123,9 +123,9 @@
#define PACKAGE_BUGREPORT "wx-dev@googlegroups.com" #define PACKAGE_BUGREPORT "wx-dev@googlegroups.com"
#define PACKAGE_NAME "wxWidgets" #define PACKAGE_NAME "wxWidgets"
#define PACKAGE_STRING "wxWidgets 3.1.0" #define PACKAGE_STRING "wxWidgets 3.1.1"
#define PACKAGE_TARNAME "wxwidgets" #define PACKAGE_TARNAME "wxwidgets"
#define PACKAGE_VERSION "3.1.0" #define PACKAGE_VERSION "3.1.1"
// for regex // for regex
#define WX_NO_REGEX_ADVANCED 1 #define WX_NO_REGEX_ADVANCED 1

4
include/wx/version.h
View File

@@ -27,9 +27,9 @@
/* NB: this file is parsed by automatic tools so don't change its format! */ /* NB: this file is parsed by automatic tools so don't change its format! */
#define wxMAJOR_VERSION 3 #define wxMAJOR_VERSION 3
#define wxMINOR_VERSION 1 #define wxMINOR_VERSION 1
#define wxRELEASE_NUMBER 0 #define wxRELEASE_NUMBER 1
#define wxSUBRELEASE_NUMBER 0 #define wxSUBRELEASE_NUMBER 0
#define wxVERSION_STRING wxT("wxWidgets 3.1.0") #define wxVERSION_STRING wxT("wxWidgets 3.1.1")
/* nothing to update below this line when updating the version */ /* nothing to update below this line when updating the version */
/* ---------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------- */

14
misc/scripts/inc_release
View File

@@ -78,9 +78,6 @@ run_sed configure.in \
run_sed build/osx/wxvers.xcconfig \ run_sed build/osx/wxvers.xcconfig \
"/DYLIB_.* = /s/$ver_for_sed/$ver_string_new/" "/DYLIB_.* = /s/$ver_for_sed/$ver_string_new/"
run_sed build/tools/bld_chm_exe.bat \
"/^SET WXW_VER=/s/$ver_for_sed/$ver_string_new/"
run_sed docs/readme.txt \ run_sed docs/readme.txt \
"/wxWidgets /s/$ver_for_sed/$ver_string_new/" \ "/wxWidgets /s/$ver_for_sed/$ver_string_new/" \
"/\//s/$ver_for_sed/$ver_string_new/" \ "/\//s/$ver_for_sed/$ver_string_new/" \
@@ -101,8 +98,6 @@ run_sed samples/Info.plist \
"/version/s/$ver_for_sed/$ver_string_new/" \ "/version/s/$ver_for_sed/$ver_string_new/" \
"/<string>/s/$ver_for_sed/$ver_string_new/" "/<string>/s/$ver_for_sed/$ver_string_new/"
run_sed samples/minimal/Info_carbon.plist \
"/<string>/s/$ver_for_sed/$ver_string_new/"
run_sed samples/minimal/Info_cocoa.plist \ run_sed samples/minimal/Info_cocoa.plist \
"/<string>/s/$ver_for_sed/$ver_string_new/" "/<string>/s/$ver_for_sed/$ver_string_new/"
@@ -110,4 +105,13 @@ run_sed samples/docview/Info.plist \
"/versionon/s/$ver_for_sed/$ver_string_new/" \ "/versionon/s/$ver_for_sed/$ver_string_new/" \
"/<string>/s/$ver_for_sed/$ver_string_new/" "/<string>/s/$ver_for_sed/$ver_string_new/"
msgn " processing MSVS 200x project files ... "
for f in build/msw/wx_vc[789]*.vcproj; do
sed -i -e 's/\(\(msw\|base\)$ver_major$ver_minor\)$ver_release/\1$ver_release_new/g' $f
done
msgc "done"
run_sed build/msw/wx_setup.props \
"/<wxVersionString>/s/\($ver_major$ver_minor\)$ver_release/\1$ver_release_new/"
msg "Don't forget to change the C:R:A triplet in build/bakefiles/version.bkl now!" msg "Don't forget to change the C:R:A triplet in build/bakefiles/version.bkl now!"

8
samples/Info.plist
View File

@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>$(PRODUCT_NAME) version 3.1.0, (c) 2005-2016 wxWidgets</string> <string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2016 wxWidgets</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>wxmac.icns</string> <string>wxmac.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>3.1.0, (c) 2005-2016 wxWidgets</string> <string>3.1.1, (c) 2005-2016 wxWidgets</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.1.0</string> <string>3.1.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>3.1.0</string> <string>3.1.1</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>

2
samples/access/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/animate/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/artprov/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/aui/Makefile.in
View File

@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/calendar/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/caret/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/clipboard/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/collpane/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/combo/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/config/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/dataview/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/debugrpt/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/dialogs/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/dialup/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/display/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/dll/Makefile.in
View File

@@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/dnd/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

8
samples/docview/Info.plist
View File

@@ -51,7 +51,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>$(PRODUCT_NAME) version 3.1.0, (c) 2005-2016 wxWidgets</string> <string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2016 wxWidgets</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>doc</string> <string>doc</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@@ -66,17 +66,17 @@
<string>it</string> <string>it</string>
</array> </array>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>3.1.0, (c) 2005-2016 wxWidgets</string> <string>3.1.1, (c) 2005-2016 wxWidgets</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.1.0</string> <string>3.1.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>WXMA</string> <string>WXMA</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>3.1.0</string> <string>3.1.1</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>

2
samples/docview/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/dragimag/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/drawing/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/erase/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/event/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/except/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/exec/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/font/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/fswatcher/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/grid/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/help/Makefile.in
View File

@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/htlbox/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/html/about/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/html/help/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/html/helpview/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/html/htmlctrl/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/html/printing/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/html/test/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/html/virtual/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/html/widget/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/html/zip/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/image/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/internat/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/ipc/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/joytest/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/keyboard/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/layout/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/listctrl/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/mdi/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/mediaplayer/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/memcheck/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/menu/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

8
samples/minimal/Info_cocoa.plist
View File

@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>$(PRODUCT_NAME) version 3.1.0, (c) 2005-2016 wxWidgets</string> <string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2016 wxWidgets</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>wxmac.icns</string> <string>wxmac.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@@ -22,17 +22,17 @@
<string>it</string> <string>it</string>
</array> </array>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>3.1.0, (c) 2005-2016 wxWidgets</string> <string>3.1.1, (c) 2005-2016 wxWidgets</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string> <string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.1.0</string> <string>3.1.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>3.1.0</string> <string>3.1.1</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright 2005-2016 wxWidgets</string> <string>Copyright 2005-2016 wxWidgets</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>

2
samples/minimal/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/nativdlg/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/notebook/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/oleauto/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/opengl/cube/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/opengl/isosurf/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/opengl/penguin/Makefile.in
View File

@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/opengl/pyramid/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
PYRAMID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ PYRAMID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/ownerdrw/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/popup/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/power/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/preferences/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/printing/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/propgrid/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/regtest/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

4
samples/render/Makefile.in
View File

@@ -51,8 +51,8 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

2
samples/render/makefile.bcc
View File

@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
### Variables: ### ### Variables: ###
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
COMPILER_PREFIX = bcc COMPILER_PREFIX = bcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

2
samples/render/makefile.gcc
View File

@@ -14,7 +14,7 @@ include ../../build/msw/config.gcc
CPPDEPS = -MT$@ -MF$@.d -MD -MP CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
COMPILER_PREFIX = gcc COMPILER_PREFIX = gcc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

2
samples/render/makefile.vc
View File

@@ -13,7 +13,7 @@
### Variables: ### ### Variables: ###
WX_RELEASE_NODOT = 31 WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
COMPILER_PREFIX = vc COMPILER_PREFIX = vc
OBJS = \ OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)

12
samples/render/render_vc7_renddll.vcproj
View File

@@ -36,7 +36,7 @@
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE" RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswuddll\renddll\" ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud310_vc.pdb" ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -47,12 +47,12 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\renddll_mswud310_vc.dll" OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud310_vc.pdb" ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
@@ -97,7 +97,7 @@
RuntimeLibrary="2" RuntimeLibrary="2"
RuntimeTypeInfo="TRUE" RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswudll\renddll\" ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu310_vc.pdb" ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
@@ -108,12 +108,12 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\renddll_mswu310_vc.dll" OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\renddll_mswu310_vc.pdb" ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
TargetMachine="1" TargetMachine="1"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2"/> EnableCOMDATFolding="2"/>

24
samples/render/render_vc8_renddll.vcproj
View File

@@ -62,7 +62,7 @@
BufferSecurityCheck="true" BufferSecurityCheck="true"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll\renddll\" ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud310_vc.pdb" ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
@@ -84,13 +84,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\renddll_mswud310_vc.dll" OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud310_vc.pdb" ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@@ -149,7 +149,7 @@
RuntimeLibrary="2" RuntimeLibrary="2"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswudll\renddll\" ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu310_vc.pdb" ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
@@ -171,13 +171,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\renddll_mswu310_vc.dll" OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\renddll_mswu310_vc.pdb" ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
TargetMachine="1" TargetMachine="1"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
@@ -241,7 +241,7 @@
BufferSecurityCheck="true" BufferSecurityCheck="true"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\renddll\" ObjectFile="vc_mswuddll_x64\renddll\"
ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud310_vc.pdb" ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
@@ -263,13 +263,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\renddll_mswud310_vc.dll" OutputFile="vc_mswuddll_x64\renddll_mswud311_vc.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud310_vc.pdb" ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@@ -328,7 +328,7 @@
RuntimeLibrary="2" RuntimeLibrary="2"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\renddll\" ObjectFile="vc_mswudll_x64\renddll\"
ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu310_vc.pdb" ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
@@ -350,13 +350,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\renddll_mswu310_vc.dll" OutputFile="vc_mswudll_x64\renddll_mswu311_vc.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu310_vc.pdb" ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu311_vc.pdb"
TargetMachine="17" TargetMachine="17"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"

24
samples/render/render_vc9_renddll.vcproj
View File

@@ -62,7 +62,7 @@
BufferSecurityCheck="true" BufferSecurityCheck="true"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll\renddll\" ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud310_vc.pdb" ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
@@ -83,13 +83,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\renddll_mswud310_vc.dll" OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud310_vc.pdb" ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@@ -149,7 +149,7 @@
RuntimeLibrary="2" RuntimeLibrary="2"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswudll\renddll\" ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu310_vc.pdb" ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
@@ -170,13 +170,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\renddll_mswu310_vc.dll" OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\renddll_mswu310_vc.pdb" ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
TargetMachine="1" TargetMachine="1"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
@@ -240,7 +240,7 @@
BufferSecurityCheck="true" BufferSecurityCheck="true"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\renddll\" ObjectFile="vc_mswuddll_x64\renddll\"
ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud310_vc.pdb" ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
@@ -261,13 +261,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\renddll_mswud310_vc.dll" OutputFile="vc_mswuddll_x64\renddll_mswud311_vc.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud310_vc.pdb" ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@@ -327,7 +327,7 @@
RuntimeLibrary="2" RuntimeLibrary="2"
RuntimeTypeInfo="true" RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\renddll\" ObjectFile="vc_mswudll_x64\renddll\"
ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu310_vc.pdb" ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu311_vc.pdb"
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
@@ -348,13 +348,13 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\renddll_mswu310_vc.dll" OutputFile="vc_mswudll_x64\renddll_mswu311_vc.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll" AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true" GenerateManifest="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu310_vc.pdb" ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu311_vc.pdb"
TargetMachine="17" TargetMachine="17"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"

2
samples/ribbon/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/richtext/Makefile.in
View File

@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/sashtest/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

2
samples/scroll/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/shaped/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/sockets/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/sound/Makefile.in
View File

@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

2
samples/splash/Makefile.in
View File

@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR = DESTDIR =
WX_RELEASE = 3.1 WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).0 WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib LIBDIRNAME = $(wx_top_builddir)/lib
SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \

Some files were not shown because too many files have changed in this diff Show More