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

Update version to 3.1.2

Browse Source 
Run misc/scripts/inc_release and rebake.
This commit is contained in:
Vadim Zeitlin
2018-02-20 00:08:01 +01:00
parent 26c18da2e4
commit 2ec2837f6d
174 changed files with 819 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/render/Makefile.in
View File

@@ -50,8 +50,8 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_RELEASE_NODOT = 31
WX_VERSION = $(WX_RELEASE).1
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
WX_VERSION = $(WX_RELEASE).2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
LIBDIRNAME = $(wx_top_builddir)/lib
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
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: ###
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
COMPILER_PREFIX = bcc
OBJS = \
$(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
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
COMPILER_PREFIX = gcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

2
samples/render/makefile.vc
View File

@@ -13,7 +13,7 @@
### Variables: ###
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
COMPILER_PREFIX = vc
OBJS = \
$(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"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -47,12 +47,12 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
OutputFile="vc_mswuddll\renddll_mswud312_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -97,7 +97,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -108,12 +108,12 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
OutputFile="vc_mswudll\renddll_mswu312_vc.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
ProgramDatabaseFile="vc_mswudll\renddll_mswu312_vc.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>

24
samples/render/render_vc8_renddll.vcproj
View File

@@ -62,7 +62,7 @@
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -84,13 +84,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
OutputFile="vc_mswuddll\renddll_mswud312_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb"
TargetMachine="1"
/>
<Tool
@@ -149,7 +149,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -171,13 +171,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
OutputFile="vc_mswudll\renddll_mswu312_vc.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
ProgramDatabaseFile="vc_mswudll\renddll_mswu312_vc.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -241,7 +241,7 @@
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\renddll\"
ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -263,13 +263,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswuddll_x64\renddll_mswud311_vc.dll"
OutputFile="vc_mswuddll_x64\renddll_mswud312_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
TargetMachine="17"
/>
<Tool
@@ -328,7 +328,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\renddll\"
ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu311_vc.pdb"
ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -350,13 +350,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswudll_x64\renddll_mswu311_vc.dll"
OutputFile="vc_mswudll_x64\renddll_mswu312_vc.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu311_vc.pdb"
ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu312_vc.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

24
samples/render/render_vc9_renddll.vcproj
View File

@@ -62,7 +62,7 @@
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll\renddll\"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -83,13 +83,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
OutputFile="vc_mswuddll\renddll_mswud312_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb"
TargetMachine="1"
/>
<Tool
@@ -149,7 +149,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll\renddll\"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
ProgramDataBaseFileName="vc_mswudll\renddll_mswu312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -170,13 +170,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
OutputFile="vc_mswudll\renddll_mswu312_vc.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
ProgramDatabaseFile="vc_mswudll\renddll_mswu312_vc.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -240,7 +240,7 @@
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\renddll\"
ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -261,13 +261,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswuddll_x64\renddll_mswud311_vc.dll"
OutputFile="vc_mswuddll_x64\renddll_mswud312_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
TargetMachine="17"
/>
<Tool
@@ -327,7 +327,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\renddll\"
ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu311_vc.pdb"
ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu312_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -348,13 +348,13 @@
Name="VCLinkerTool"
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"
OutputFile="vc_mswudll_x64\renddll_mswu311_vc.dll"
OutputFile="vc_mswudll_x64\renddll_mswu312_vc.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu311_vc.pdb"
ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu312_vc.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"