diff options
Diffstat (limited to 'build_windows')
139 files changed, 1786 insertions, 1010 deletions
diff --git a/build_windows/Berkeley_DB.sln b/build_windows/Berkeley_DB.sln index 90da2913..2ce7f1e5 100644 --- a/build_windows/Berkeley_DB.sln +++ b/build_windows/Berkeley_DB.sln @@ -87,6 +87,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_access", "VS8\ex_access. {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7} = {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_blob", "VS8\ex_blob.vcproj", "{0460962E-97E3-40fd-B3CD-702085F2FC98}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7} = {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_bulk", "VS8\ex_bulk.vcproj", "{ABE1ACF6-C375-44AB-A628-80B4A94580FD}"
ProjectSection(ProjectDependencies) = postProject
{FD045D60-ABAD-4A6C-9794-9BFB085FC3E7} = {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7}
@@ -239,6 +244,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_btrec", "VS8\excxx_bt {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7} = {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_bulk", "VS8\excxx_bulk.vcproj", "{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7} = {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_env", "VS8\excxx_env.vcproj", "{E790C029-341D-489B-B987-D35947AD78C3}"
ProjectSection(ProjectDependencies) = postProject
{FD045D60-ABAD-4A6C-9794-9BFB085FC3E7} = {FD045D60-ABAD-4A6C-9794-9BFB085FC3E7}
diff --git a/build_windows/Berkeley_DB_examples.sln b/build_windows/Berkeley_DB_examples.sln index e2db4343..8eb5b9cc 100644 --- a/build_windows/Berkeley_DB_examples.sln +++ b/build_windows/Berkeley_DB_examples.sln @@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_access", "VS8\ex_access.vcproj", "{75DF98AA-25DF-4183-A022-024CF918480D}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_blob", "VS8\ex_blob.vcproj", "{0460962E-97E3-40fd-B3CD-702085F2FC98}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_btrec", "VS8\ex_btrec.vcproj", "{5DD66F4B-EB4A-4453-BC31-3FF7B2240634}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_bulk", "VS8\ex_bulk.vcproj", "{ABE1ACF6-C375-44AB-A628-80B4A94580FD}"
@@ -70,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_access", "VS8\excxx_a EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_btrec", "VS8\excxx_btrec.vcproj", "{38C080B1-7003-48DF-820D-06348BC87B1B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_bulk", "VS8\excxx_bulk.vcproj", "{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_env", "VS8\excxx_env.vcproj", "{E790C029-341D-489B-B987-D35947AD78C3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_example_database_load", "VS8\excxx_example_database_load.vcproj", "{A4F42222-FE02-431D-A046-B049E516DEB7}"
diff --git a/build_windows/Berkeley_DB_examples_vs2010.sln b/build_windows/Berkeley_DB_examples_vs2010.sln index be1c10d9..bd356825 100644 --- a/build_windows/Berkeley_DB_examples_vs2010.sln +++ b/build_windows/Berkeley_DB_examples_vs2010.sln @@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_access", "VS10\ex_access.vcxproj"", "{75DF98AA-25DF-4183-A022-024CF918480D}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_blob", "VS10\ex_blob.vcxproj"", "{0460962E-97E3-40fd-B3CD-702085F2FC98}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_btrec", "VS10\ex_btrec.vcxproj"", "{5DD66F4B-EB4A-4453-BC31-3FF7B2240634}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_bulk", "VS10\ex_bulk.vcxproj"", "{ABE1ACF6-C375-44AB-A628-80B4A94580FD}"
@@ -64,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_access", "VS10\excxx_ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_btrec", "VS10\excxx_btrec.vcxproj"", "{38C080B1-7003-48DF-820D-06348BC87B1B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_bulk", "VS10\excxx_bulk.vcxproj"", "{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_env", "VS10\excxx_env.vcxproj"", "{E790C029-341D-489B-B987-D35947AD78C3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_example_database_load", "VS10\excxx_example_database_load.vcxproj"", "{A4F42222-FE02-431D-A046-B049E516DEB7}"
diff --git a/build_windows/Berkeley_DB_vs2010.sln b/build_windows/Berkeley_DB_vs2010.sln index 79c2cf25..c3159ec4 100644 --- a/build_windows/Berkeley_DB_vs2010.sln +++ b/build_windows/Berkeley_DB_vs2010.sln @@ -36,6 +36,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_verify", "VS10\db_verify EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_access", "VS10\ex_access.vcxproj", "{75DF98AA-25DF-4183-A022-024CF918480D}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_blob", "VS10\ex_blob.vcxproj", "{0460962E-97E3-40FD-B3CD-702085F2FC98}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_bulk", "VS10\ex_bulk.vcxproj", "{ABE1ACF6-C375-44AB-A628-80B4A94580FD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_btrec", "VS10\ex_btrec.vcxproj", "{5DD66F4B-EB4A-4453-BC31-3FF7B2240634}"
@@ -96,6 +98,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_access", "VS10\excxx_ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_btrec", "VS10\excxx_btrec.vcxproj", "{38C080B1-7003-48DF-820D-06348BC87B1B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_bulk", "VS10\excxx_bulk.vcxproj", "{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_env", "VS10\excxx_env.vcxproj", "{E790C029-341D-489B-B987-D35947AD78C3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excxx_example_database_load", "VS10\excxx_example_database_load.vcxproj", "{A4F42222-FE02-431D-A046-B049E516DEB7}"
diff --git a/build_windows/VS10/application.props b/build_windows/VS10/application.props index 3f2bc015..c27991de 100644 --- a/build_windows/VS10/application.props +++ b/build_windows/VS10/application.props @@ -2,7 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
- <BDB_VERSION>53</BDB_VERSION>
+ <BDB_VERSION>61</BDB_VERSION>
</PropertyGroup>
<PropertyGroup>
<OutDir>..\..\build_windows\$(Platform)\$(Configuration)\</OutDir>
diff --git a/build_windows/VS10/db.vcxproj b/build_windows/VS10/db.vcxproj index cce29506..6a534581 100644 --- a/build_windows/VS10/db.vcxproj +++ b/build_windows/VS10/db.vcxproj @@ -151,6 +151,10 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Condition="exists('..\..\src\crypto\aes_method.c')" Include="..\..\src\crypto\aes_method.c"/> + <ClCompile Include="..\..\src\blob\blob_fileops.c"/> + <ClCompile Include="..\..\src\blob\blob_page.c"/> + <ClCompile Include="..\..\src\blob\blob_stream.c"/> + <ClCompile Include="..\..\src\blob\blob_util.c"/> <ClCompile Include="..\..\src\btree\bt_compact.c"/> <ClCompile Include="..\..\src\btree\bt_compare.c"/> <ClCompile Include="..\..\src\btree\bt_compress.c"/> @@ -177,6 +181,7 @@ <ClCompile Include="..\..\lang\cxx\cxx_channel.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_db.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbc.cpp"/> + <ClCompile Include="..\..\lang\cxx\cxx_dbstream.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbt.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_env.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_except.cpp"/> @@ -271,7 +276,6 @@ <ClCompile Include="..\..\src\hash\hash_verify.c"/> <ClCompile Include="..\..\src\heap\heap.c"/> <ClCompile Include="..\..\src\heap\heap_auto.c"/> - <ClCompile Include="..\..\src\heap\heap_autop.c"/> <ClCompile Include="..\..\src\heap\heap_backup.c"/> <ClCompile Include="..\..\src\heap\heap_conv.c"/> <ClCompile Include="..\..\src\heap\heap_method.c"/> @@ -279,6 +283,7 @@ <ClCompile Include="..\..\src\heap\heap_rec.c"/> <ClCompile Include="..\..\src\heap\heap_reclaim.c"/> <ClCompile Include="..\..\src\heap\heap_stat.c"/> + <ClCompile Include="..\..\src\heap\heap_upgrade.c"/> <ClCompile Include="..\..\src\heap\heap_verify.c"/> <ClCompile Include="..\..\src\hmac\hmac.c"/> <ClCompile Include="..\..\lang\hsearch\hsearch.c"/> @@ -349,6 +354,7 @@ <ClCompile Include="..\..\src\os_windows\os_map.c"/> <ClCompile Include="..\..\src\os_windows\os_mkdir.c"/> <ClCompile Include="..\..\src\os_windows\os_open.c"/> + <ClCompile Include="..\..\src\os_windows\os_rmdir.c"/> <ClCompile Include="..\..\src\os\os_path.c"/> <ClCompile Include="..\..\src\os\os_pid.c"/> <ClCompile Include="..\..\src\os_windows\os_rename.c"/> @@ -424,7 +430,7 @@ <None Include="../libdb.def"/> </ItemGroup> <ItemGroup> - <ResourceCompile Include="../libdb.rc"> + <ResourceCompile Include="..\..\build_windows\libdb.rc"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'">NDEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/build_windows/VS10/db_csharp.vcxproj b/build_windows/VS10/db_csharp.vcxproj index bff570b9..c7f79d37 100644 --- a/build_windows/VS10/db_csharp.vcxproj +++ b/build_windows/VS10/db_csharp.vcxproj @@ -57,10 +57,10 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,15 +68,15 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/db_java.vcxproj b/build_windows/VS10/db_java.vcxproj index 4c2e515f..2fb8643f 100644 --- a/build_windows/VS10/db_java.vcxproj +++ b/build_windows/VS10/db_java.vcxproj @@ -60,20 +60,21 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -83,20 +84,21 @@ echo Java build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -106,20 +108,21 @@ echo Java build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -129,20 +132,21 @@ echo Java build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <CustomBuildStep> <Command> echo compiling Berkeley DB Java classes mkdir "./$(OutDir)/classes/" -javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java +javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" . -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" . +jar cf "dbexamples.jar" -C "classes.ex" . echo Java build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> diff --git a/build_windows/VS10/db_printlog.vcxproj b/build_windows/VS10/db_printlog.vcxproj index b746c0d6..d1a1c369 100644 --- a/build_windows/VS10/db_printlog.vcxproj +++ b/build_windows/VS10/db_printlog.vcxproj @@ -63,6 +63,7 @@ <ClCompile Include="..\..\src\dbreg\dbreg_autop.c"/> <ClCompile Include="..\..\src\fileops\fileops_autop.c"/> <ClCompile Include="..\..\src\hash\hash_autop.c"/> + <ClCompile Include="..\..\src\heap\heap_autop.c"/> <ClCompile Include="..\..\src\qam\qam_autop.c"/> <ClCompile Include="..\..\src\repmgr\repmgr_autop.c"/> <ClCompile Include="..\..\src\txn\txn_autop.c"/> diff --git a/build_windows/VS10/db_reptest.vcxproj b/build_windows/VS10/db_reptest.vcxproj new file mode 100644 index 00000000..5bf687c5 --- /dev/null +++ b/build_windows/VS10/db_reptest.vcxproj @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" ?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{{4786F27F-FF38-42e8-87C1-CC3B6E544C5D}}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/> + </ImportGroup> + <ImportGroup> + <Import Project="application.props"/> + </ImportGroup> + <PropertyGroup Label="UserMacros"/> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + </PropertyGroup> + <ItemGroup> + <ClCompile Include="..\..\test\repmgr\db_reptest.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_am.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_handles.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_spawn.c"/> + <ClCompile Include="..\..\test\repmgr\reptest_util.c"/> + <ClCompile Include="..\..\src\clib\getopt.c"/> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ItemGroup> + </ItemGroup> +</Project> diff --git a/build_windows/VS10/db_small.vcxproj b/build_windows/VS10/db_small.vcxproj index 3c67d572..4849826e 100644 --- a/build_windows/VS10/db_small.vcxproj +++ b/build_windows/VS10/db_small.vcxproj @@ -150,6 +150,10 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\src\blob\blob_fileops.c"/> + <ClCompile Include="..\..\src\blob\blob_page.c"/> + <ClCompile Include="..\..\src\blob\blob_stream.c"/> + <ClCompile Include="..\..\src\blob\blob_util.c"/> <ClCompile Include="..\..\src\btree\bt_compact.c"/> <ClCompile Include="..\..\src\btree\bt_compare.c"/> <ClCompile Include="..\..\src\btree\bt_conv.c"/> @@ -188,6 +192,7 @@ <ClCompile Include="..\..\lang\cxx\cxx_channel.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_db.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbc.cpp"/> + <ClCompile Include="..\..\lang\cxx\cxx_dbstream.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_dbt.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_env.cpp"/> <ClCompile Include="..\..\lang\cxx\cxx_except.cpp"/> @@ -324,6 +329,7 @@ <ClCompile Include="..\..\src\os_windows\os_map.c"/> <ClCompile Include="..\..\src\os_windows\os_mkdir.c"/> <ClCompile Include="..\..\src\os_windows\os_open.c"/> + <ClCompile Include="..\..\src\os_windows\os_rmdir.c"/> <ClCompile Include="..\..\src\os\os_path.c"/> <ClCompile Include="..\..\src\os_windows\os_rename.c"/> <ClCompile Include="..\..\src\os_windows\os_rw.c"/> diff --git a/build_windows/VS10/db_sql.vcxproj b/build_windows/VS10/db_sql.vcxproj index dbd7093f..ffbd5c63 100644 --- a/build_windows/VS10/db_sql.vcxproj +++ b/build_windows/VS10/db_sql.vcxproj @@ -98,7 +98,7 @@ </ClCompile> <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'"> @@ -113,7 +113,7 @@ <PreprocessorDefinitions>SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'"> @@ -129,7 +129,7 @@ </ClCompile> <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'"> @@ -144,7 +144,7 @@ <PreprocessorDefinitions>SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'"> @@ -182,7 +182,9 @@ <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_icu.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_porter.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_snippet.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_term.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_write.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\func.c"/> @@ -230,6 +232,7 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeaux.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeblob.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbemem.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\src\vdbesort.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbetrace.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vtab.c"/> <ClCompile Include="..\..\lang\sql\adapter\wal.c"/> diff --git a/build_windows/VS10/db_sql_jdbc.vcxproj b/build_windows/VS10/db_sql_jdbc.vcxproj index 4bb7106f..39087b91 100644 --- a/build_windows/VS10/db_sql_jdbc.vcxproj +++ b/build_windows/VS10/db_sql_jdbc.vcxproj @@ -65,17 +65,18 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> @@ -86,17 +87,18 @@ echo JDBC build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> @@ -107,17 +109,18 @@ echo JDBC build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> @@ -128,17 +131,18 @@ echo JDBC build finished</Command> <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PreBuildEvent> <Command> mkdir "./$(OutDir)/jdbc_classes/" echo compiling JDBC classes -javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java +javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java echo Building JNI header files javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob echo creating jar file -jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" . +cd $(OutDir) +jar cf "jdbc.jar" -C "jdbc_classes" . echo JDBC build finished</Command> <Message/> </PreBuildEvent> diff --git a/build_windows/VS10/db_sql_odbc.vcxproj b/build_windows/VS10/db_sql_odbc.vcxproj index 1d0c4e76..6649b8e5 100644 --- a/build_windows/VS10/db_sql_odbc.vcxproj +++ b/build_windows/VS10/db_sql_odbc.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -71,7 +71,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -81,7 +81,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -91,7 +91,7 @@ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\lang\sql\odbc\sqlite3odbc.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -99,7 +99,7 @@ <ClCompile Include="..\..\lang\sql\odbc\sqlite3odbc.c"/> </ItemGroup> <ItemGroup> - <ResourceCompile Include="../sql/odbc/sqlite3odbc.rc"> + <ResourceCompile Include="..\..\lang\sql\odbc\sqlite3odbc.rc"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;$(NoInherit));%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/build_windows/VS10/db_sql_shell.vcxproj b/build_windows/VS10/db_sql_shell.vcxproj index 7ff5c711..cd6dbefb 100644 --- a/build_windows/VS10/db_sql_shell.vcxproj +++ b/build_windows/VS10/db_sql_shell.vcxproj @@ -62,7 +62,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_DEBUG;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -71,7 +71,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_DEBUG;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -89,7 +89,7 @@ <PreprocessorDefinitions>WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/db_sql_testfixture.vcxproj b/build_windows/VS10/db_sql_testfixture.vcxproj index 8acd2083..dcd7e96b 100644 --- a/build_windows/VS10/db_sql_testfixture.vcxproj +++ b/build_windows/VS10/db_sql_testfixture.vcxproj @@ -62,7 +62,7 @@ <PreprocessorDefinitions>WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_MEMDEBUG;;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -120,9 +120,25 @@ <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_icu.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_porter.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_snippet.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_term.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_test.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/> <ClCompile Include="..\..\lang\sql\sqlite\ext\fts3\fts3_write.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\amatch.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\closure.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\fuzzer.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\ieee754.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\nextchar.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\percentile.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\regexp.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\rot13.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\spellfix.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\totype.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\vfslog.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\vtshim.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\ext\misc\wholenumber.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\func.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\global.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\hash.c"/> @@ -170,6 +186,7 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeaux.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbeblob.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbemem.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\src\vdbesort.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vdbetrace.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\vtab.c"/> <ClCompile Include="..\..\lang\sql\adapter\wal.c"/> @@ -193,8 +210,8 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\test_config.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_demovfs.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_devsym.c"/> + <ClCompile Include="..\..\lang\sql\sqlite\src\test_fs.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_func.c"/> - <ClCompile Include="..\..\lang\sql\sqlite\src\test_fuzzer.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_hexio.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_intarray.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_journal.c"/> @@ -216,7 +233,6 @@ <ClCompile Include="..\..\lang\sql\sqlite\src\test_thread.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_vfs.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_vfstrace.c"/> - <ClCompile Include="..\..\lang\sql\sqlite\src\test_wholenumber.c"/> <ClCompile Include="..\..\lang\sql\sqlite\src\test_wsd.c"/> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> diff --git a/build_windows/VS10/db_stl.vcxproj b/build_windows/VS10/db_stl.vcxproj index e193c137..57805a40 100644 --- a/build_windows/VS10/db_stl.vcxproj +++ b/build_windows/VS10/db_stl.vcxproj @@ -97,7 +97,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'"> @@ -112,7 +112,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'"> @@ -127,7 +127,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'"> @@ -142,7 +142,7 @@ <PreprocessorDefinitions>_UNICODE;UNICODE;DB_CREATE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'"> diff --git a/build_windows/VS10/db_tcl.vcxproj b/build_windows/VS10/db_tcl.vcxproj index b1fffe9d..da0bbb46 100644 --- a/build_windows/VS10/db_tcl.vcxproj +++ b/build_windows/VS10/db_tcl.vcxproj @@ -60,7 +60,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -69,7 +69,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -78,7 +78,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;CONFIG_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;tcl85g.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -87,7 +87,7 @@ <PreprocessorDefinitions>DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;tcl85.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>..\..\build_windows\libdb_tcl.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> @@ -98,6 +98,7 @@ <ClCompile Include="..\..\lang\tcl\tcl_db.c"/> <ClCompile Include="..\..\lang\tcl\tcl_db_pkg.c"/> <ClCompile Include="..\..\lang\tcl\tcl_dbcursor.c"/> + <ClCompile Include="..\..\lang\tcl\tcl_dbstream.c"/> <ClCompile Include="..\..\lang\tcl\tcl_env.c"/> <ClCompile Include="..\..\lang\tcl\tcl_internal.c"/> <ClCompile Include="..\..\lang\tcl\tcl_lock.c"/> diff --git a/build_windows/VS10/ex_blob.vcxproj b/build_windows/VS10/ex_blob.vcxproj new file mode 100644 index 00000000..df5ff0a8 --- /dev/null +++ b/build_windows/VS10/ex_blob.vcxproj @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" ?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0460962E-97E3-40fd-B3CD-702085F2FC98}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/> + </ImportGroup> + <ImportGroup> + <Import Project="application.props"/> + </ImportGroup> + <PropertyGroup Label="UserMacros"/> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + </PropertyGroup> + <ItemGroup> + <ClCompile Include="..\..\src\clib\getopt.c"/> + <ClCompile Include="..\..\examples\c\ex_blob.c"/> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ItemGroup> + <ProjectReference Condition="exists('db.vcxproj')" Include="db.vcxproj"> + <Project>{fd045d60-abad-4a6c-9794-9bfb085fc3e7}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> +</Project> diff --git a/build_windows/VS10/ex_java.vcxproj b/build_windows/VS10/ex_java.vcxproj index 7ea9a9e2..fa3ff587 100644 --- a/build_windows/VS10/ex_java.vcxproj +++ b/build_windows/VS10/ex_java.vcxproj @@ -60,9 +60,10 @@ <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -72,9 +73,10 @@ echo Java example build finished</Command> <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -84,9 +86,10 @@ echo Java example build finished</Command> <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> @@ -96,9 +99,10 @@ echo Java example build finished</Command> <Command> echo compiling examples mkdir "$(OutDir)\classes.ex" -javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java +javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java echo creating jar files -jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" . +cd $(OutDir) +jar cf "dbexamples.jar" -C "classes.ex" . echo Java example build finished</Command> <Outputs>force_compilation.txt;%(Outputs)</Outputs> </CustomBuildStep> diff --git a/build_windows/VS10/ex_sql_binding.vcxproj b/build_windows/VS10/ex_sql_binding.vcxproj index 4f0d89c7..e9306029 100644 --- a/build_windows/VS10/ex_sql_binding.vcxproj +++ b/build_windows/VS10/ex_sql_binding.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_fts3.vcxproj b/build_windows/VS10/ex_sql_fts3.vcxproj index 586fb860..c4bf3930 100644 --- a/build_windows/VS10/ex_sql_fts3.vcxproj +++ b/build_windows/VS10/ex_sql_fts3.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_index.vcxproj b/build_windows/VS10/ex_sql_index.vcxproj index b4afbcbf..7a53235d 100644 --- a/build_windows/VS10/ex_sql_index.vcxproj +++ b/build_windows/VS10/ex_sql_index.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_load.vcxproj b/build_windows/VS10/ex_sql_load.vcxproj index b4087c72..f670af88 100644 --- a/build_windows/VS10/ex_sql_load.vcxproj +++ b/build_windows/VS10/ex_sql_load.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_multi_thread.vcxproj b/build_windows/VS10/ex_sql_multi_thread.vcxproj index 12553f71..cf551e1f 100644 --- a/build_windows/VS10/ex_sql_multi_thread.vcxproj +++ b/build_windows/VS10/ex_sql_multi_thread.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_query.vcxproj b/build_windows/VS10/ex_sql_query.vcxproj index 491bfae1..fbc1dddb 100644 --- a/build_windows/VS10/ex_sql_query.vcxproj +++ b/build_windows/VS10/ex_sql_query.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_rtree.vcxproj b/build_windows/VS10/ex_sql_rtree.vcxproj index a749e9ac..05e98747 100644 --- a/build_windows/VS10/ex_sql_rtree.vcxproj +++ b/build_windows/VS10/ex_sql_rtree.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_savepoint.vcxproj b/build_windows/VS10/ex_sql_savepoint.vcxproj index 8b6a451b..c77ac245 100644 --- a/build_windows/VS10/ex_sql_savepoint.vcxproj +++ b/build_windows/VS10/ex_sql_savepoint.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_statement.vcxproj b/build_windows/VS10/ex_sql_statement.vcxproj index a2df5aad..7923e365 100644 --- a/build_windows/VS10/ex_sql_statement.vcxproj +++ b/build_windows/VS10/ex_sql_statement.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/ex_sql_transaction.vcxproj b/build_windows/VS10/ex_sql_transaction.vcxproj index f541a804..5216c237 100644 --- a/build_windows/VS10/ex_sql_transaction.vcxproj +++ b/build_windows/VS10/ex_sql_transaction.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <AdditionalIncludeDirectories>../../lang/sql/generated;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_sql53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_sql61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/excxx_bulk.vcxproj b/build_windows/VS10/excxx_bulk.vcxproj new file mode 100644 index 00000000..d99a9350 --- /dev/null +++ b/build_windows/VS10/excxx_bulk.vcxproj @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" ?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform"/> + </ImportGroup> + <ImportGroup> + <Import Project="application.props"/> + </ImportGroup> + <PropertyGroup Label="UserMacros"/> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + </PropertyGroup> + <ItemGroup> + <ClCompile Include="..\..\src\clib\getopt.c"/> + <ClCompile Include="..\..\examples\cxx\BulkExample.cpp"/> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ItemGroup> + <ProjectReference Condition="exists('db.vcxproj')" Include="db.vcxproj"> + <Project>{fd045d60-abad-4a6c-9794-9bfb085fc3e7}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> +</Project> diff --git a/build_windows/VS10/exstl_access.vcxproj b/build_windows/VS10/exstl_access.vcxproj index 7fff3ba5..33f33cef 100644 --- a/build_windows/VS10/exstl_access.vcxproj +++ b/build_windows/VS10/exstl_access.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_advancedfeatures.vcxproj b/build_windows/VS10/exstl_advancedfeatures.vcxproj index c96c6264..709516d3 100644 --- a/build_windows/VS10/exstl_advancedfeatures.vcxproj +++ b/build_windows/VS10/exstl_advancedfeatures.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_repquote.vcxproj b/build_windows/VS10/exstl_repquote.vcxproj index 946d7154..e7b139f7 100644 --- a/build_windows/VS10/exstl_repquote.vcxproj +++ b/build_windows/VS10/exstl_repquote.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_tpcb.vcxproj b/build_windows/VS10/exstl_tpcb.vcxproj index ce517266..0591025e 100644 --- a/build_windows/VS10/exstl_tpcb.vcxproj +++ b/build_windows/VS10/exstl_tpcb.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/exstl_txnguide.vcxproj b/build_windows/VS10/exstl_txnguide.vcxproj index c5d82bbc..a89463cf 100644 --- a/build_windows/VS10/exstl_txnguide.vcxproj +++ b/build_windows/VS10/exstl_txnguide.vcxproj @@ -60,7 +60,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -77,7 +77,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <AdditionalIncludeDirectories>../../lang/cxx/stl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/library.props b/build_windows/VS10/library.props index 05bf71d5..1154ad1b 100644 --- a/build_windows/VS10/library.props +++ b/build_windows/VS10/library.props @@ -2,7 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
- <BDB_VERSION>53</BDB_VERSION>
+ <BDB_VERSION>61</BDB_VERSION>
</PropertyGroup>
<PropertyGroup>
<OutDir>..\..\build_windows\$(Platform)\$(Configuration)\</OutDir>
diff --git a/build_windows/VS10/php_db4.vcxproj b/build_windows/VS10/php_db4.vcxproj index 7c4e9a36..c2f74459 100644 --- a/build_windows/VS10/php_db4.vcxproj +++ b/build_windows/VS10/php_db4.vcxproj @@ -60,7 +60,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -68,7 +68,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -76,7 +76,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61d.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <PreprocessorDefinitions>COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb53.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb61.lib;.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/stl_test.vcxproj b/build_windows/VS10/stl_test.vcxproj index 99feacdf..6da8f3f4 100644 --- a/build_windows/VS10/stl_test.vcxproj +++ b/build_windows/VS10/stl_test.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -70,7 +70,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -90,7 +90,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/stl_test_msexamples.vcxproj b/build_windows/VS10/stl_test_msexamples.vcxproj index 935eec42..3960524f 100644 --- a/build_windows/VS10/stl_test_msexamples.vcxproj +++ b/build_windows/VS10/stl_test_msexamples.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -70,7 +70,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -90,7 +90,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/stl_test_stlport.vcxproj b/build_windows/VS10/stl_test_stlport.vcxproj index 61153d82..649342c9 100644 --- a/build_windows/VS10/stl_test_stlport.vcxproj +++ b/build_windows/VS10/stl_test_stlport.vcxproj @@ -61,7 +61,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -70,7 +70,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -80,7 +80,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61d.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -90,7 +90,7 @@ <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>libdb_stl53.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libdb_stl61.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/build_windows/VS10/test_cutest.vcxproj b/build_windows/VS10/test_cutest.vcxproj index d1bd8929..7d3dfa65 100644 --- a/build_windows/VS10/test_cutest.vcxproj +++ b/build_windows/VS10/test_cutest.vcxproj @@ -96,6 +96,7 @@ <ClCompile Include="..\..\test\c\cutest\CuTest.c"/> <ClCompile Include="..\..\test\c\cutest\CuTests.c"/> <ClCompile Include="..\..\test\c\cutest\Runner.c"/> + <ClCompile Include="..\..\test\c\suites\TestCallbackSetterAndGetter.c"/> <ClCompile Include="..\..\test\c\suites\TestChannel.c"/> <ClCompile Include="..\..\test\c\suites\TestDbHotBackup.c"/> <ClCompile Include="..\..\test\c\suites\TestDbTuner.c"/> @@ -103,7 +104,10 @@ <ClCompile Include="..\..\test\c\suites\TestEnvConfig.c"/> <ClCompile Include="..\..\test\c\suites\TestEnvMethod.c"/> <ClCompile Include="..\..\test\c\suites\TestKeyExistErrorReturn.c"/> + <ClCompile Include="..\..\test\c\suites\TestMutexAlignment.c"/> <ClCompile Include="..\..\test\c\suites\TestPartial.c"/> + <ClCompile Include="..\..\test\c\suites\TestPartition.c"/> + <ClCompile Include="..\..\test\c\suites\TestPreOpenSetterAndGetter.c"/> <ClCompile Include="..\..\test\c\suites\TestQueue.c"/> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> diff --git a/build_windows/VS8/db.vcproj b/build_windows/VS8/db.vcproj index a0bf7bd1..32718244 100644 --- a/build_windows/VS8/db.vcproj +++ b/build_windows/VS8/db.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_UNICODE;UNICODE;DB_CREATE_DLL;CONFIG_TEST;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb53d.dll" ProgramDatabaseFile="$(OutDir)/libdb53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb53d.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb61d.dll" ProgramDatabaseFile="$(OutDir)/libdb61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb61d.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_UNICODE;UNICODE;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb53.dll" ProgramDatabaseFile="$(OutDir)/libdb53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb53.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb61.dll" ProgramDatabaseFile="$(OutDir)/libdb61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb61.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb53sd.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb61sd.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Static Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -41,7 +41,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb53s.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb61s.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -49,7 +49,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_UNICODE;UNICODE;DB_CREATE_DLL;CONFIG_TEST;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb53d.dll" ProgramDatabaseFile="$(OutDir)/libdb53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb53d.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb61d.dll" ProgramDatabaseFile="$(OutDir)/libdb61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb61d.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -60,7 +60,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_UNICODE;UNICODE;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb53.dll" ProgramDatabaseFile="$(OutDir)/libdb53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb53.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb61.dll" ProgramDatabaseFile="$(OutDir)/libdb61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb61.lib" ModuleDefinitionFile="..\..\build_windows\libdb.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -71,7 +71,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb53sd.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb61sd.lib" AdditionalOptions="/machine:x64"/></Configuration> <Configuration Name="Static Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -79,11 +79,15 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db.pch" AssemblerListingLocation="$(OutDir)/db/" ObjectFile="$(OutDir)/db/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb53s.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb61s.lib" AdditionalOptions="/machine:x64"/></Configuration> </Configurations> <References/> <Files> <File RelativePath="..\..\src\crypto\aes_method.c"/> + <File RelativePath="..\..\src\blob\blob_fileops.c"/> + <File RelativePath="..\..\src\blob\blob_page.c"/> + <File RelativePath="..\..\src\blob\blob_stream.c"/> + <File RelativePath="..\..\src\blob\blob_util.c"/> <File RelativePath="..\..\src\btree\bt_compact.c"/> <File RelativePath="..\..\src\btree\bt_compare.c"/> <File RelativePath="..\..\src\btree\bt_compress.c"/> @@ -110,6 +114,7 @@ <File RelativePath="..\..\lang\cxx\cxx_channel.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_db.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_dbc.cpp"/> + <File RelativePath="..\..\lang\cxx\cxx_dbstream.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_dbt.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_env.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_except.cpp"/> @@ -204,7 +209,6 @@ <File RelativePath="..\..\src\hash\hash_verify.c"/> <File RelativePath="..\..\src\heap\heap.c"/> <File RelativePath="..\..\src\heap\heap_auto.c"/> - <File RelativePath="..\..\src\heap\heap_autop.c"/> <File RelativePath="..\..\src\heap\heap_backup.c"/> <File RelativePath="..\..\src\heap\heap_conv.c"/> <File RelativePath="..\..\src\heap\heap_method.c"/> @@ -212,6 +216,7 @@ <File RelativePath="..\..\src\heap\heap_rec.c"/> <File RelativePath="..\..\src\heap\heap_reclaim.c"/> <File RelativePath="..\..\src\heap\heap_stat.c"/> + <File RelativePath="..\..\src\heap\heap_upgrade.c"/> <File RelativePath="..\..\src\heap\heap_verify.c"/> <File RelativePath="..\..\src\hmac\hmac.c"/> <File RelativePath="..\..\lang\hsearch\hsearch.c"/> @@ -293,6 +298,7 @@ <File RelativePath="..\..\src\os_windows\os_map.c"/> <File RelativePath="..\..\src\os_windows\os_mkdir.c"/> <File RelativePath="..\..\src\os_windows\os_open.c"/> + <File RelativePath="..\..\src\os_windows\os_rmdir.c"/> <File RelativePath="..\..\src\os\os_path.c"/> <File RelativePath="..\..\src\os\os_pid.c"/> <File RelativePath="..\..\src\os_windows\os_rename.c"/> diff --git a/build_windows/VS8/db_archive.vcproj b/build_windows/VS8/db_archive.vcproj index 67c60602..4997c8c8 100644 --- a/build_windows/VS8/db_archive.vcproj +++ b/build_windows/VS8/db_archive.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_archive.pch" AssemblerListingLocation="$(OutDir)/db_archive/" ObjectFile="$(OutDir)/db_archive/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_archive.pch" AssemblerListingLocation="$(OutDir)/db_archive/" ObjectFile="$(OutDir)/db_archive/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_archive.pch" AssemblerListingLocation="$(OutDir)/db_archive/" ObjectFile="$(OutDir)/db_archive/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_archive.pch" AssemblerListingLocation="$(OutDir)/db_archive/" ObjectFile="$(OutDir)/db_archive/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_archive.exe" ProgramDatabaseFile="$(OutDir)/db_archive.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_checkpoint.vcproj b/build_windows/VS8/db_checkpoint.vcproj index 0dfb11e1..2ee38948 100644 --- a/build_windows/VS8/db_checkpoint.vcproj +++ b/build_windows/VS8/db_checkpoint.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_checkpoint.pch" AssemblerListingLocation="$(OutDir)/db_checkpoint/" ObjectFile="$(OutDir)/db_checkpoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_checkpoint.pch" AssemblerListingLocation="$(OutDir)/db_checkpoint/" ObjectFile="$(OutDir)/db_checkpoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_checkpoint.pch" AssemblerListingLocation="$(OutDir)/db_checkpoint/" ObjectFile="$(OutDir)/db_checkpoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_checkpoint.pch" AssemblerListingLocation="$(OutDir)/db_checkpoint/" ObjectFile="$(OutDir)/db_checkpoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_checkpoint.exe" ProgramDatabaseFile="$(OutDir)/db_checkpoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_csharp.vcproj b/build_windows/VS8/db_csharp.vcproj index 219152e9..6e0740ed 100644 --- a/build_windows/VS8/db_csharp.vcproj +++ b/build_windows/VS8/db_csharp.vcproj @@ -10,8 +10,8 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_csharp.pch" AssemblerListingLocation="$(OutDir)/db_csharp/" ObjectFile="$(OutDir)/db_csharp/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp53d.lib" TargetMachine="0"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;CONFIG_TEST;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_csharp.pch" AssemblerListingLocation="$(OutDir)/db_csharp/" ObjectFile="$(OutDir)/db_csharp/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_csharp.pch" AssemblerListingLocation="$(OutDir)/db_csharp/" ObjectFile="$(OutDir)/db_csharp/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp53.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp61.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -32,8 +32,8 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_csharp.pch" AssemblerListingLocation="$(OutDir)/db_csharp/" ObjectFile="$(OutDir)/db_csharp/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp53d.lib" TargetMachine="0"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;CONFIG_TEST;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_csharp.pch" AssemblerListingLocation="$(OutDir)/db_csharp/" ObjectFile="$(OutDir)/db_csharp/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_csharp.pch" AssemblerListingLocation="$(OutDir)/db_csharp/" ObjectFile="$(OutDir)/db_csharp/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp53.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_csharp61.dll" ProgramDatabaseFile="$(OutDir)/libdb_csharp61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_csharp61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_deadlock.vcproj b/build_windows/VS8/db_deadlock.vcproj index 7a5b6da3..1e607987 100644 --- a/build_windows/VS8/db_deadlock.vcproj +++ b/build_windows/VS8/db_deadlock.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_deadlock.pch" AssemblerListingLocation="$(OutDir)/db_deadlock/" ObjectFile="$(OutDir)/db_deadlock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_deadlock.pch" AssemblerListingLocation="$(OutDir)/db_deadlock/" ObjectFile="$(OutDir)/db_deadlock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_deadlock.pch" AssemblerListingLocation="$(OutDir)/db_deadlock/" ObjectFile="$(OutDir)/db_deadlock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_deadlock.pch" AssemblerListingLocation="$(OutDir)/db_deadlock/" ObjectFile="$(OutDir)/db_deadlock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_deadlock.exe" ProgramDatabaseFile="$(OutDir)/db_deadlock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_dump.vcproj b/build_windows/VS8/db_dump.vcproj index 7a004b12..7957dd99 100644 --- a/build_windows/VS8/db_dump.vcproj +++ b/build_windows/VS8/db_dump.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_dump.pch" AssemblerListingLocation="$(OutDir)/db_dump/" ObjectFile="$(OutDir)/db_dump/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_dump.pch" AssemblerListingLocation="$(OutDir)/db_dump/" ObjectFile="$(OutDir)/db_dump/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_dump.pch" AssemblerListingLocation="$(OutDir)/db_dump/" ObjectFile="$(OutDir)/db_dump/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_dump.pch" AssemblerListingLocation="$(OutDir)/db_dump/" ObjectFile="$(OutDir)/db_dump/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_dump.exe" ProgramDatabaseFile="$(OutDir)/db_dump.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_hotbackup.vcproj b/build_windows/VS8/db_hotbackup.vcproj index 3f76f482..d18b9a27 100644 --- a/build_windows/VS8/db_hotbackup.vcproj +++ b/build_windows/VS8/db_hotbackup.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_hotbackup.pch" AssemblerListingLocation="$(OutDir)/db_hotbackup/" ObjectFile="$(OutDir)/db_hotbackup/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_hotbackup.pch" AssemblerListingLocation="$(OutDir)/db_hotbackup/" ObjectFile="$(OutDir)/db_hotbackup/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_hotbackup.pch" AssemblerListingLocation="$(OutDir)/db_hotbackup/" ObjectFile="$(OutDir)/db_hotbackup/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_hotbackup.pch" AssemblerListingLocation="$(OutDir)/db_hotbackup/" ObjectFile="$(OutDir)/db_hotbackup/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_hotbackup.exe" ProgramDatabaseFile="$(OutDir)/db_hotbackup.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_java.vcproj b/build_windows/VS8/db_java.vcproj index e28b94d4..4f76ecd3 100644 --- a/build_windows/VS8/db_java.vcproj +++ b/build_windows/VS8/db_java.vcproj @@ -11,10 +11,10 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_java.pch" AssemblerListingLocation="$(OutDir)/db_java/" ObjectFile="$(OutDir)/db_java/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_java53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java53d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_java61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" .
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" .
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> <Configuration Name="Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/db_java" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -22,10 +22,10 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_java.pch" AssemblerListingLocation="$(OutDir)/db_java/" ObjectFile="$(OutDir)/db_java/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java53.dll" ProgramDatabaseFile="$(OutDir)/libdb_java53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java61.dll" ProgramDatabaseFile="$(OutDir)/libdb_java61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" .
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" .
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_java" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -33,10 +33,10 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_java.pch" AssemblerListingLocation="$(OutDir)/db_java/" ObjectFile="$(OutDir)/db_java/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_java53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java53d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_java61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" .
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" .
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> <Configuration Name="Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/db_java" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -44,10 +44,10 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;UNICODE;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_java.pch" AssemblerListingLocation="$(OutDir)/db_java/" ObjectFile="$(OutDir)/db_java/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java53.dll" ProgramDatabaseFile="$(OutDir)/libdb_java53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_java61.dll" ProgramDatabaseFile="$(OutDir)/libdb_java61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_java61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -target 1.5 -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cfm "$(OutDir)/db.jar" ../..\lang/java/jarManifestEntries -C "$(OutDir)\classes" .
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling Berkeley DB Java classes 
mkdir "./$(OutDir)/classes/" 
javac -g -d "$(OutDir)\classes" -classpath "$(OutDir)\classes" ..\..\lang\java\src\com\sleepycat\db\*.java ..\..\lang\java\src\com\sleepycat\db\internal\*.java ..\..\lang\java\src\com\sleepycat\asm\*.java ..\..\lang\java\src\com\sleepycat\bind\*.java ..\..\lang\java\src\com\sleepycat\bind\serial\*.java ..\..\lang\java\src\com\sleepycat\bind\tuple\*.java ..\..\lang\java\src\com\sleepycat\collections\*.java ..\..\lang\java\src\com\sleepycat\compat\*.java ..\..\lang\java\src\com\sleepycat\persist\*.java ..\..\lang\java\src\com\sleepycat\persist\evolve\*.java ..\..\lang\java\src\com\sleepycat\persist\impl\*.java ..\..\lang\java\src\com\sleepycat\persist\model\*.java ..\..\lang\java\src\com\sleepycat\persist\raw\*.java ..\..\lang\java\src\com\sleepycat\util\*.java ..\..\lang\java\src\com\sleepycat\util\keyrange\*.java
java -classpath $(OutDir)\classes com.sleepycat.persist.model.ClassEnhancer $(OutDir)\classes
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cfm "db.jar" ../../..\lang/java/jarManifestEntries -C "classes" .
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java build finished" Outputs="force_compilation.txt"/></Configuration> </Configurations> <References/> <Files> diff --git a/build_windows/VS8/db_load.vcproj b/build_windows/VS8/db_load.vcproj index 3cd703ed..e90bcccc 100644 --- a/build_windows/VS8/db_load.vcproj +++ b/build_windows/VS8/db_load.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_load.pch" AssemblerListingLocation="$(OutDir)/db_load/" ObjectFile="$(OutDir)/db_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_load.pch" AssemblerListingLocation="$(OutDir)/db_load/" ObjectFile="$(OutDir)/db_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_load.pch" AssemblerListingLocation="$(OutDir)/db_load/" ObjectFile="$(OutDir)/db_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_load.pch" AssemblerListingLocation="$(OutDir)/db_load/" ObjectFile="$(OutDir)/db_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_load.exe" ProgramDatabaseFile="$(OutDir)/db_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_log_verify.vcproj b/build_windows/VS8/db_log_verify.vcproj index 4e36f23f..8b406653 100644 --- a/build_windows/VS8/db_log_verify.vcproj +++ b/build_windows/VS8/db_log_verify.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_log_verify.pch" AssemblerListingLocation="$(OutDir)/db_log_verify/" ObjectFile="$(OutDir)/db_log_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_log_verify.pch" AssemblerListingLocation="$(OutDir)/db_log_verify/" ObjectFile="$(OutDir)/db_log_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_log_verify.pch" AssemblerListingLocation="$(OutDir)/db_log_verify/" ObjectFile="$(OutDir)/db_log_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_log_verify.pch" AssemblerListingLocation="$(OutDir)/db_log_verify/" ObjectFile="$(OutDir)/db_log_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_log_verify.exe" ProgramDatabaseFile="$(OutDir)/db_log_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_perf.vcproj b/build_windows/VS8/db_perf.vcproj index 4d088746..55c16cf0 100644 --- a/build_windows/VS8/db_perf.vcproj +++ b/build_windows/VS8/db_perf.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_perf.pch" AssemblerListingLocation="$(OutDir)/db_perf/" ObjectFile="$(OutDir)/db_perf/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_perf.pch" AssemblerListingLocation="$(OutDir)/db_perf/" ObjectFile="$(OutDir)/db_perf/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_perf.pch" AssemblerListingLocation="$(OutDir)/db_perf/" ObjectFile="$(OutDir)/db_perf/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_perf.pch" AssemblerListingLocation="$(OutDir)/db_perf/" ObjectFile="$(OutDir)/db_perf/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_perf.exe" ProgramDatabaseFile="$(OutDir)/db_perf.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_printlog.vcproj b/build_windows/VS8/db_printlog.vcproj index 8c3fca4b..d10001bf 100644 --- a/build_windows/VS8/db_printlog.vcproj +++ b/build_windows/VS8/db_printlog.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_printlog.pch" AssemblerListingLocation="$(OutDir)/db_printlog/" ObjectFile="$(OutDir)/db_printlog/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_printlog.pch" AssemblerListingLocation="$(OutDir)/db_printlog/" ObjectFile="$(OutDir)/db_printlog/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_printlog.pch" AssemblerListingLocation="$(OutDir)/db_printlog/" ObjectFile="$(OutDir)/db_printlog/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_printlog.pch" AssemblerListingLocation="$(OutDir)/db_printlog/" ObjectFile="$(OutDir)/db_printlog/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_printlog.exe" ProgramDatabaseFile="$(OutDir)/db_printlog.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -58,6 +58,7 @@ <File RelativePath="..\..\src\dbreg\dbreg_autop.c"/> <File RelativePath="..\..\src\fileops\fileops_autop.c"/> <File RelativePath="..\..\src\hash\hash_autop.c"/> + <File RelativePath="..\..\src\heap\heap_autop.c"/> <File RelativePath="..\..\src\qam\qam_autop.c"/> <File RelativePath="..\..\src\repmgr\repmgr_autop.c"/> <File RelativePath="..\..\src\txn\txn_autop.c"/> diff --git a/build_windows/VS8/db_recover.vcproj b/build_windows/VS8/db_recover.vcproj index b8f06f7b..d1dd6bb6 100644 --- a/build_windows/VS8/db_recover.vcproj +++ b/build_windows/VS8/db_recover.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_recover.pch" AssemblerListingLocation="$(OutDir)/db_recover/" ObjectFile="$(OutDir)/db_recover/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_recover.pch" AssemblerListingLocation="$(OutDir)/db_recover/" ObjectFile="$(OutDir)/db_recover/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_recover.pch" AssemblerListingLocation="$(OutDir)/db_recover/" ObjectFile="$(OutDir)/db_recover/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_recover.pch" AssemblerListingLocation="$(OutDir)/db_recover/" ObjectFile="$(OutDir)/db_recover/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_recover.exe" ProgramDatabaseFile="$(OutDir)/db_recover.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_replicate.vcproj b/build_windows/VS8/db_replicate.vcproj index ee196a2b..f28d6d23 100644 --- a/build_windows/VS8/db_replicate.vcproj +++ b/build_windows/VS8/db_replicate.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_replicate.pch" AssemblerListingLocation="$(OutDir)/db_replicate/" ObjectFile="$(OutDir)/db_replicate/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_replicate.pch" AssemblerListingLocation="$(OutDir)/db_replicate/" ObjectFile="$(OutDir)/db_replicate/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_replicate.pch" AssemblerListingLocation="$(OutDir)/db_replicate/" ObjectFile="$(OutDir)/db_replicate/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_replicate.pch" AssemblerListingLocation="$(OutDir)/db_replicate/" ObjectFile="$(OutDir)/db_replicate/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_replicate.exe" ProgramDatabaseFile="$(OutDir)/db_replicate.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_repsite.vcproj b/build_windows/VS8/db_repsite.vcproj index cc430582..29ff1670 100644 --- a/build_windows/VS8/db_repsite.vcproj +++ b/build_windows/VS8/db_repsite.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_repsite.pch" AssemblerListingLocation="$(OutDir)/db_repsite/" ObjectFile="$(OutDir)/db_repsite/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_repsite.pch" AssemblerListingLocation="$(OutDir)/db_repsite/" ObjectFile="$(OutDir)/db_repsite/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_repsite.pch" AssemblerListingLocation="$(OutDir)/db_repsite/" ObjectFile="$(OutDir)/db_repsite/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_repsite.pch" AssemblerListingLocation="$(OutDir)/db_repsite/" ObjectFile="$(OutDir)/db_repsite/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_repsite.exe" ProgramDatabaseFile="$(OutDir)/db_repsite.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_reptest.vcproj b/build_windows/VS8/db_reptest.vcproj new file mode 100644 index 00000000..7e2d37b4 --- /dev/null +++ b/build_windows/VS8/db_reptest.vcproj @@ -0,0 +1,62 @@ +<VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="db_reptest" ProjectGUID="{{4786F27F-FF38-42e8-87C1-CC3B6E544C5D}}"> + <Platforms> + <Platform Name="Win32"/> + <Platform Name="x64"/> + </Platforms> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_reptest" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_reptest.pch" AssemblerListingLocation="$(OutDir)/db_reptest/" ObjectFile="$(OutDir)/db_reptest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_reptest.exe" ProgramDatabaseFile="$(OutDir)/db_reptest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/db_reptest" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_reptest.pch" AssemblerListingLocation="$(OutDir)/db_reptest/" ObjectFile="$(OutDir)/db_reptest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_reptest.exe" ProgramDatabaseFile="$(OutDir)/db_reptest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_reptest" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_reptest.pch" AssemblerListingLocation="$(OutDir)/db_reptest/" ObjectFile="$(OutDir)/db_reptest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_reptest.exe" ProgramDatabaseFile="$(OutDir)/db_reptest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/db_reptest" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_reptest.pch" AssemblerListingLocation="$(OutDir)/db_reptest/" ObjectFile="$(OutDir)/db_reptest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_reptest.exe" ProgramDatabaseFile="$(OutDir)/db_reptest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + </Configurations> + <References/> + <Files> + <File RelativePath="..\..\test\repmgr\db_reptest.c"/> + <File RelativePath="..\..\test\repmgr\reptest_am.c"/> + <File RelativePath="..\..\test\repmgr\reptest_handles.c"/> + <File RelativePath="..\..\test\repmgr\reptest_spawn.c"/> + <File RelativePath="..\..\test\repmgr\reptest_util.c"/> + <File RelativePath="..\..\src\clib\getopt.c"/> + </Files> + <Globals/> +</VisualStudioProject> diff --git a/build_windows/VS8/db_small.vcproj b/build_windows/VS8/db_small.vcproj index 3bbb9e26..7ecf4dc6 100644 --- a/build_windows/VS8/db_small.vcproj +++ b/build_windows/VS8/db_small.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;HAVE_SMALLBUILD;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small53sd.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small61sd.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Static Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db_small" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -19,7 +19,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;HAVE_SMALLBUILD;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small53s.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small61s.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Debug|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_small" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -27,7 +27,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_UNICODE;UNICODE;HAVE_SMALLBUILD;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_small53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small53d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_small61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small61d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -38,7 +38,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_UNICODE;UNICODE;HAVE_SMALLBUILD;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small53.dll" ProgramDatabaseFile="$(OutDir)/libdb_small53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small53.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small61.dll" ProgramDatabaseFile="$(OutDir)/libdb_small61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small61.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -49,7 +49,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;HAVE_SMALLBUILD;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small53sd.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small61sd.lib" AdditionalOptions="/machine:x64"/></Configuration> <Configuration Name="Static Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db_small" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -57,7 +57,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;HAVE_SMALLBUILD;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small53s.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_small61s.lib" AdditionalOptions="/machine:x64"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_small" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -65,7 +65,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_UNICODE;UNICODE;HAVE_SMALLBUILD;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_small53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small53d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64 /FIXED:NO /export:__db_assert" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_small61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small61d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -76,13 +76,17 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_UNICODE;UNICODE;HAVE_SMALLBUILD;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_small.pch" AssemblerListingLocation="$(OutDir)/db_small/" ObjectFile="$(OutDir)/db_small/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small53.dll" ProgramDatabaseFile="$(OutDir)/libdb_small53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small53.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="ws2_32.lib" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/libdb_small61.dll" ProgramDatabaseFile="$(OutDir)/libdb_small61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_small61.lib" ModuleDefinitionFile="..\..\build_windows\libdb_small.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> </Configurations> <References/> <Files> + <File RelativePath="..\..\src\blob\blob_fileops.c"/> + <File RelativePath="..\..\src\blob\blob_page.c"/> + <File RelativePath="..\..\src\blob\blob_stream.c"/> + <File RelativePath="..\..\src\blob\blob_util.c"/> <File RelativePath="..\..\src\btree\bt_compact.c"/> <File RelativePath="..\..\src\btree\bt_compare.c"/> <File RelativePath="..\..\src\btree\bt_conv.c"/> @@ -121,6 +125,7 @@ <File RelativePath="..\..\lang\cxx\cxx_channel.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_db.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_dbc.cpp"/> + <File RelativePath="..\..\lang\cxx\cxx_dbstream.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_dbt.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_env.cpp"/> <File RelativePath="..\..\lang\cxx\cxx_except.cpp"/> @@ -257,6 +262,7 @@ <File RelativePath="..\..\src\os_windows\os_map.c"/> <File RelativePath="..\..\src\os_windows\os_mkdir.c"/> <File RelativePath="..\..\src\os_windows\os_open.c"/> + <File RelativePath="..\..\src\os_windows\os_rmdir.c"/> <File RelativePath="..\..\src\os\os_path.c"/> <File RelativePath="..\..\src\os_windows\os_rename.c"/> <File RelativePath="..\..\src\os_windows\os_rw.c"/> diff --git a/build_windows/VS8/db_sql.vcproj b/build_windows/VS8/db_sql.vcproj index e33b8fe5..79c128c7 100644 --- a/build_windows/VS8/db_sql.vcproj +++ b/build_windows/VS8/db_sql.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_DEBUG;SQLITE_MEMDEBUG;SQLITE_API=__declspec(dllexport);_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86 /FIXED:NO" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql53d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86 /FIXED:NO" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_API=__declspec(dllexport);_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql53.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql61.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_DEBUG;SQLITE_MEMDEBUG;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql53sd.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql61sd.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Static Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db_sql" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -41,7 +41,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql53s.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql61s.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_sql" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -49,7 +49,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_DEBUG;SQLITE_MEMDEBUG;SQLITE_API=__declspec(dllexport);_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64 /FIXED:NO" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql53d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64 /FIXED:NO" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -60,7 +60,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_API=__declspec(dllexport);_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql53.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_sql61.dll" ProgramDatabaseFile="$(OutDir)/libdb_sql61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_sql61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -71,7 +71,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;SQLITE_DEBUG;SQLITE_MEMDEBUG;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql53sd.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql61sd.lib" AdditionalOptions="/machine:x64"/></Configuration> <Configuration Name="Static Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db_sql" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -79,7 +79,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SQLITE_CORE;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_LOAD_EXTENSION;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql.pch" AssemblerListingLocation="$(OutDir)/db_sql/" ObjectFile="$(OutDir)/db_sql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql53s.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_sql61s.lib" AdditionalOptions="/machine:x64"/></Configuration> </Configurations> <References/> <Files> @@ -111,7 +111,9 @@ <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_icu.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_porter.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_snippet.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_term.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_write.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\func.c"/> @@ -159,6 +161,7 @@ <File RelativePath="..\..\lang\sql\sqlite\src\vdbeaux.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vdbeblob.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vdbemem.c"/> + <File RelativePath="..\..\lang\sql\sqlite\src\vdbesort.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vdbetrace.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vtab.c"/> <File RelativePath="..\..\lang\sql\adapter\wal.c"/> diff --git a/build_windows/VS8/db_sql_codegen.vcproj b/build_windows/VS8/db_sql_codegen.vcproj index 15c95c25..7efee943 100644 --- a/build_windows/VS8/db_sql_codegen.vcproj +++ b/build_windows/VS8/db_sql_codegen.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_codegen.pch" AssemblerListingLocation="$(OutDir)/db_sql_codegen/" ObjectFile="$(OutDir)/db_sql_codegen/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_codegen.pch" AssemblerListingLocation="$(OutDir)/db_sql_codegen/" ObjectFile="$(OutDir)/db_sql_codegen/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_codegen.pch" AssemblerListingLocation="$(OutDir)/db_sql_codegen/" ObjectFile="$(OutDir)/db_sql_codegen/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_codegen.pch" AssemblerListingLocation="$(OutDir)/db_sql_codegen/" ObjectFile="$(OutDir)/db_sql_codegen/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_sql_codegen.exe" ProgramDatabaseFile="$(OutDir)/db_sql_codegen.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_sql_jdbc.vcproj b/build_windows/VS8/db_sql_jdbc.vcproj index 6f48551c..f3a1ebe9 100644 --- a/build_windows/VS8/db_sql_jdbc.vcproj +++ b/build_windows/VS8/db_sql_jdbc.vcproj @@ -11,8 +11,8 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree,../../lang/sql/jdbc/native" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_jdbc.pch" AssemblerListingLocation="$(OutDir)/sqlite_jni/" ObjectFile="$(OutDir)/sqlite_jni/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> - <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" .
echo JDBC build finished" Description=""/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
cd $(OutDir)
jar cf "jdbc.jar" -C "jdbc_classes" .
echo JDBC build finished" Description=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> <Configuration Name="Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/db_sql_jdbc" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> @@ -22,8 +22,8 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree,../../lang/sql/jdbc/native" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_jdbc.pch" AssemblerListingLocation="$(OutDir)/sqlite_jni/" ObjectFile="$(OutDir)/sqlite_jni/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> - <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" .
echo JDBC build finished" Description=""/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
cd $(OutDir)
jar cf "jdbc.jar" -C "jdbc_classes" .
echo JDBC build finished" Description=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_sql_jdbc" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> @@ -33,8 +33,8 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree,../../lang/sql/jdbc/native" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_jdbc.pch" AssemblerListingLocation="$(OutDir)/sqlite_jni/" ObjectFile="$(OutDir)/sqlite_jni/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> - <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" .
echo JDBC build finished" Description=""/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
cd $(OutDir)
jar cf "jdbc.jar" -C "jdbc_classes" .
echo JDBC build finished" Description=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> <Configuration Name="Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/db_sql_jdbc" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> @@ -44,8 +44,8 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree,../../lang/sql/jdbc/native" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;UNICODE;HAVE_SQLITE3;HAVE_SQLITE3_MALLOC=1;HAVE_SQLITE3_PREPARE_V2=1;HAVE_SQLITE3_PREPARE16_V2=1;HAVE_SQLITE3_BIND_ZEROBLOB=1;HAVE_SQLITE3_CLEAR_BINDINGS=1;HAVE_SQLITE3_BIND_PARAMETER_COUNT=1;HAVE_SQLITE3_BIND_PARAMETER_NAME=1;HAVE_SQLITE3_BIND_PARAMETER_INDEX=1;HAVE_SQLITE3_RESULT_ZEROBLOB=1;HAVE_SQLITE3_INCRBLOBIO=1;HAVE_SQLITE3_SHARED_CACHE=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_jdbc.pch" AssemblerListingLocation="$(OutDir)/sqlite_jni/" ObjectFile="$(OutDir)/sqlite_jni/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> - <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -target 1.5 -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
jar cf "$(OutDir)\jdbc.jar" -C "$(OutDir)\jdbc_classes" .
echo JDBC build finished" Description=""/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite_jni.dll" ProgramDatabaseFile="$(OutDir)/sqlite_jni.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite_jni.lib" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool" CommandLine="
mkdir "./$(OutDir)/jdbc_classes/" 
echo compiling JDBC classes
javac -g -d "$(OutDir)\jdbc_classes" -classpath "$(OutDir)\jdbc_classes" ..\..\lang\sql\jdbc\SQLite\*java ..\..\lang\sql\jdbc\SQLite\JDBC2x\*java
echo Building JNI header files
javah -o ..\..\lang\sql\jdbc\native\sqlite_jni.h -classpath "$(OutDir)\jdbc_classes" SQLite.Database SQLite.Vm SQLite.FunctionContext SQLite.Stmt SQLite.Blob
echo creating jar file
cd $(OutDir)
jar cf "jdbc.jar" -C "jdbc_classes" .
echo JDBC build finished" Description=""/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> </Configurations> diff --git a/build_windows/VS8/db_sql_odbc.vcproj b/build_windows/VS8/db_sql_odbc.vcproj index f2a0c5d5..792fdf31 100644 --- a/build_windows/VS8/db_sql_odbc.vcproj +++ b/build_windows/VS8/db_sql_odbc.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_odbc.pch" AssemblerListingLocation="$(OutDir)/db_sql_odbc/" ObjectFile="$(OutDir)/db_sql_odbc/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_odbc.pch" AssemblerListingLocation="$(OutDir)/db_sql_odbc/" ObjectFile="$(OutDir)/db_sql_odbc/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_odbc.pch" AssemblerListingLocation="$(OutDir)/db_sql_odbc/" ObjectFile="$(OutDir)/db_sql_odbc/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USRDLL;SQLITE_EXPORTS;_CRT_SECURE_NO_WARNINGS;SQLITE_CORE;_WIN32;WITHOUT_SHELL;HAVE_SQLITE3PREPAREV2=1;NO_TCL;THREADSAFE=1;SQLITE_DLL=1;SQLITE_THREADSAFE=1;SQLITE_OS_WIN=1;SQLITE_ASCII=1;SQLITE_SOUNDEX=1;SQLITE_OMIT_SHARED_CACHE=1;SQLITE_OMIT_EXPLAIN=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_odbc.pch" AssemblerListingLocation="$(OutDir)/db_sql_odbc/" ObjectFile="$(OutDir)/db_sql_odbc/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/sqlite3odbc.dll" ProgramDatabaseFile="$(OutDir)/sqlite3odbc.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/sqlite3odbc.lib" ModuleDefinitionFile="..\..\lang\sql\odbc\sqlite3odbc.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_sql_shell.vcproj b/build_windows/VS8/db_sql_shell.vcproj index 784c56aa..779aa732 100644 --- a/build_windows/VS8/db_sql_shell.vcproj +++ b/build_windows/VS8/db_sql_shell.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_DEBUG;SQLITE_MEMDEBUG;;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_shell.pch" AssemblerListingLocation="$(OutDir)/dbsql/" ObjectFile="$(OutDir)/dbsql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_shell.pch" AssemblerListingLocation="$(OutDir)/dbsql/" ObjectFile="$(OutDir)/dbsql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_DEBUG;SQLITE_MEMDEBUG;;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_shell.pch" AssemblerListingLocation="$(OutDir)/dbsql/" ObjectFile="$(OutDir)/dbsql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_CONSOLE;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_shell.pch" AssemblerListingLocation="$(OutDir)/dbsql/" ObjectFile="$(OutDir)/dbsql/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/dbsql.exe" ProgramDatabaseFile="$(OutDir)/dbsql.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_sql_testfixture.vcproj b/build_windows/VS8/db_sql_testfixture.vcproj index d8fae9b1..48c56914 100644 --- a/build_windows/VS8/db_sql_testfixture.vcproj +++ b/build_windows/VS8/db_sql_testfixture.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_MEMDEBUG;;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_testfixture.pch" AssemblerListingLocation="$(OutDir)/testfixture/" ObjectFile="$(OutDir)/testfixture/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib tcl85g.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_testfixture.pch" AssemblerListingLocation="$(OutDir)/testfixture/" ObjectFile="$(OutDir)/testfixture/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;SQLITE_MEMDEBUG;;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_testfixture.pch" AssemblerListingLocation="$(OutDir)/testfixture/" ObjectFile="$(OutDir)/testfixture/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib tcl85g.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/sql/generated,../../lang/sql/adapter,../../lang/sql/sqlite/src,../../lang/sql/sqlite/ext/fts3,../../lang/sql/sqlite/ext/rtree" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_CONSOL;STATIC_BUILD;SQLITE_TEST;TCLSH;SQLITE_NO_SYNC;SQLITE_CRASH_TEST;SQLITE_SERVER;SQLITE_PRIVATE;SQLITE_CORE;SQLITE_THREADSAFE=1;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE_UNICODE;UNICODE;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_sql_testfixture.pch" AssemblerListingLocation="$(OutDir)/testfixture/" ObjectFile="$(OutDir)/testfixture/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/testfixture.exe" ProgramDatabaseFile="$(OutDir)/testfixture.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -78,9 +78,25 @@ <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_icu.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_porter.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_snippet.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_term.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_test.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer1.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenizer.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_tokenize_vtab.c"/> <File RelativePath="..\..\lang\sql\sqlite\ext\fts3\fts3_write.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\amatch.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\closure.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\fuzzer.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\ieee754.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\nextchar.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\percentile.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\regexp.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\rot13.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\spellfix.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\totype.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\vfslog.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\vtshim.c"/> + <File RelativePath="..\..\lang\sql\sqlite\ext\misc\wholenumber.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\func.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\global.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\hash.c"/> @@ -128,6 +144,7 @@ <File RelativePath="..\..\lang\sql\sqlite\src\vdbeaux.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vdbeblob.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vdbemem.c"/> + <File RelativePath="..\..\lang\sql\sqlite\src\vdbesort.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vdbetrace.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\vtab.c"/> <File RelativePath="..\..\lang\sql\adapter\wal.c"/> @@ -151,8 +168,8 @@ <File RelativePath="..\..\lang\sql\sqlite\src\test_config.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_demovfs.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_devsym.c"/> + <File RelativePath="..\..\lang\sql\sqlite\src\test_fs.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_func.c"/> - <File RelativePath="..\..\lang\sql\sqlite\src\test_fuzzer.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_hexio.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_intarray.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_journal.c"/> @@ -174,7 +191,6 @@ <File RelativePath="..\..\lang\sql\sqlite\src\test_thread.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_vfs.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_vfstrace.c"/> - <File RelativePath="..\..\lang\sql\sqlite\src\test_wholenumber.c"/> <File RelativePath="..\..\lang\sql\sqlite\src\test_wsd.c"/> </Files> <Globals/> diff --git a/build_windows/VS8/db_stat.vcproj b/build_windows/VS8/db_stat.vcproj index b5cf4c4a..26853411 100644 --- a/build_windows/VS8/db_stat.vcproj +++ b/build_windows/VS8/db_stat.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stat.pch" AssemblerListingLocation="$(OutDir)/db_stat/" ObjectFile="$(OutDir)/db_stat/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stat.pch" AssemblerListingLocation="$(OutDir)/db_stat/" ObjectFile="$(OutDir)/db_stat/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stat.pch" AssemblerListingLocation="$(OutDir)/db_stat/" ObjectFile="$(OutDir)/db_stat/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stat.pch" AssemblerListingLocation="$(OutDir)/db_stat/" ObjectFile="$(OutDir)/db_stat/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_stat.exe" ProgramDatabaseFile="$(OutDir)/db_stat.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_stl.vcproj b/build_windows/VS8/db_stl.vcproj index d7699d3f..7e95a823 100644 --- a/build_windows/VS8/db_stl.vcproj +++ b/build_windows/VS8/db_stl.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_UNICODE;UNICODE;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl53d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_UNICODE;UNICODE;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl53.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl61.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl53sd.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl61sd.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Static Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db_stl" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -41,7 +41,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl53s.lib" AdditionalOptions="/machine:x86"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl61s.lib" AdditionalOptions="/machine:x86"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/db_stl" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -49,7 +49,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_UNICODE;UNICODE;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl53d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl61d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -60,7 +60,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_UNICODE;UNICODE;DB_CREATE_DLL;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl53.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl53.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/libdb_stl61.dll" ProgramDatabaseFile="$(OutDir)/libdb_stl61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_stl61.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -71,7 +71,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl53sd.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl61sd.lib" AdditionalOptions="/machine:x64"/></Configuration> <Configuration Name="Static Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Static_Release" IntermediateDirectory="./$(OutDir)/db_stl" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -79,7 +79,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;UNICODE;_LIB;" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_stl.pch" AssemblerListingLocation="$(OutDir)/db_stl/" ObjectFile="$(OutDir)/db_stl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl53s.lib" AdditionalOptions="/machine:x64"/></Configuration> + <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libdb_stl61s.lib" AdditionalOptions="/machine:x64"/></Configuration> </Configurations> <References/> <Files> diff --git a/build_windows/VS8/db_tcl.vcproj b/build_windows/VS8/db_tcl.vcproj index 82ba1841..d1968fc9 100644 --- a/build_windows/VS8/db_tcl.vcproj +++ b/build_windows/VS8/db_tcl.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;CONFIG_TEST;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tcl.pch" AssemblerListingLocation="$(OutDir)/db_tcl/" ObjectFile="$(OutDir)/db_tcl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib tcl85g.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl53d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl61d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tcl.pch" AssemblerListingLocation="$(OutDir)/db_tcl/" ObjectFile="$(OutDir)/db_tcl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl53.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl53.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl61.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl61.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;CONFIG_TEST;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tcl.pch" AssemblerListingLocation="$(OutDir)/db_tcl/" ObjectFile="$(OutDir)/db_tcl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib tcl85g.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl53d.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl53d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl53d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl61d.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl61d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl61d.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;DB_CREATE_DLL;_UNICODE;DB_TCL_SUPPORT;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tcl.pch" AssemblerListingLocation="$(OutDir)/db_tcl/" ObjectFile="$(OutDir)/db_tcl/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl53.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl53.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl53.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib tcl85.lib" AdditionalLibraryDirectories="$(OutDir);C:/tcl/lib;../../lib" OutputFile="$(OutDir)/libdb_tcl61.dll" ProgramDatabaseFile="$(OutDir)/libdb_tcl61.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/libdb_tcl61.lib" ModuleDefinitionFile="..\..\build_windows\libdb_tcl.def" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -57,6 +57,7 @@ <File RelativePath="..\..\lang\tcl\tcl_db.c"/> <File RelativePath="..\..\lang\tcl\tcl_db_pkg.c"/> <File RelativePath="..\..\lang\tcl\tcl_dbcursor.c"/> + <File RelativePath="..\..\lang\tcl\tcl_dbstream.c"/> <File RelativePath="..\..\lang\tcl\tcl_env.c"/> <File RelativePath="..\..\lang\tcl\tcl_internal.c"/> <File RelativePath="..\..\lang\tcl\tcl_lock.c"/> diff --git a/build_windows/VS8/db_test.vcproj b/build_windows/VS8/db_test.vcproj index eb2f8885..f3165359 100644 --- a/build_windows/VS8/db_test.vcproj +++ b/build_windows/VS8/db_test.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_test.pch" AssemblerListingLocation="$(OutDir)/dbkill/" ObjectFile="$(OutDir)/dbkill/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_test.pch" AssemblerListingLocation="$(OutDir)/dbkill/" ObjectFile="$(OutDir)/dbkill/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_test.pch" AssemblerListingLocation="$(OutDir)/dbkill/" ObjectFile="$(OutDir)/dbkill/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_test.pch" AssemblerListingLocation="$(OutDir)/dbkill/" ObjectFile="$(OutDir)/dbkill/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/dbkill.exe" ProgramDatabaseFile="$(OutDir)/dbkill.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_tuner.vcproj b/build_windows/VS8/db_tuner.vcproj index edf62c06..f7b4484f 100644 --- a/build_windows/VS8/db_tuner.vcproj +++ b/build_windows/VS8/db_tuner.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tuner.pch" AssemblerListingLocation="$(OutDir)/db_tuner/" ObjectFile="$(OutDir)/db_tuner/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tuner.pch" AssemblerListingLocation="$(OutDir)/db_tuner/" ObjectFile="$(OutDir)/db_tuner/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tuner.pch" AssemblerListingLocation="$(OutDir)/db_tuner/" ObjectFile="$(OutDir)/db_tuner/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_tuner.pch" AssemblerListingLocation="$(OutDir)/db_tuner/" ObjectFile="$(OutDir)/db_tuner/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_tuner.exe" ProgramDatabaseFile="$(OutDir)/db_tuner.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_upgrade.vcproj b/build_windows/VS8/db_upgrade.vcproj index bd30fdd4..ce611f5d 100644 --- a/build_windows/VS8/db_upgrade.vcproj +++ b/build_windows/VS8/db_upgrade.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_upgrade.pch" AssemblerListingLocation="$(OutDir)/db_upgrade/" ObjectFile="$(OutDir)/db_upgrade/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_upgrade.pch" AssemblerListingLocation="$(OutDir)/db_upgrade/" ObjectFile="$(OutDir)/db_upgrade/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_upgrade.pch" AssemblerListingLocation="$(OutDir)/db_upgrade/" ObjectFile="$(OutDir)/db_upgrade/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_upgrade.pch" AssemblerListingLocation="$(OutDir)/db_upgrade/" ObjectFile="$(OutDir)/db_upgrade/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_upgrade.exe" ProgramDatabaseFile="$(OutDir)/db_upgrade.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/db_verify.vcproj b/build_windows/VS8/db_verify.vcproj index 16c17eb7..f1b03d9a 100644 --- a/build_windows/VS8/db_verify.vcproj +++ b/build_windows/VS8/db_verify.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_verify.pch" AssemblerListingLocation="$(OutDir)/db_verify/" ObjectFile="$(OutDir)/db_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_verify.pch" AssemblerListingLocation="$(OutDir)/db_verify/" ObjectFile="$(OutDir)/db_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_verify.pch" AssemblerListingLocation="$(OutDir)/db_verify/" ObjectFile="$(OutDir)/db_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/db_verify.pch" AssemblerListingLocation="$(OutDir)/db_verify/" ObjectFile="$(OutDir)/db_verify/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/db_verify.exe" ProgramDatabaseFile="$(OutDir)/db_verify.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_access.vcproj b/build_windows/VS8/ex_access.vcproj index 0162c6fe..6d89f792 100644 --- a/build_windows/VS8/ex_access.vcproj +++ b/build_windows/VS8/ex_access.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_access.pch" AssemblerListingLocation="$(OutDir)/ex_access/" ObjectFile="$(OutDir)/ex_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_access.pch" AssemblerListingLocation="$(OutDir)/ex_access/" ObjectFile="$(OutDir)/ex_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_access.pch" AssemblerListingLocation="$(OutDir)/ex_access/" ObjectFile="$(OutDir)/ex_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_access.pch" AssemblerListingLocation="$(OutDir)/ex_access/" ObjectFile="$(OutDir)/ex_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_access.exe" ProgramDatabaseFile="$(OutDir)/ex_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_blob.vcproj b/build_windows/VS8/ex_blob.vcproj new file mode 100644 index 00000000..3d718d1d --- /dev/null +++ b/build_windows/VS8/ex_blob.vcproj @@ -0,0 +1,58 @@ +<VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="ex_blob" ProjectGUID="{0460962E-97E3-40fd-B3CD-702085F2FC98}"> + <Platforms> + <Platform Name="Win32"/> + <Platform Name="x64"/> + </Platforms> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/ex_blob" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_blob.pch" AssemblerListingLocation="$(OutDir)/ex_blob/" ObjectFile="$(OutDir)/ex_blob/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_blob.exe" ProgramDatabaseFile="$(OutDir)/ex_blob.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/ex_blob" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_blob.pch" AssemblerListingLocation="$(OutDir)/ex_blob/" ObjectFile="$(OutDir)/ex_blob/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_blob.exe" ProgramDatabaseFile="$(OutDir)/ex_blob.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/ex_blob" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_blob.pch" AssemblerListingLocation="$(OutDir)/ex_blob/" ObjectFile="$(OutDir)/ex_blob/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_blob.exe" ProgramDatabaseFile="$(OutDir)/ex_blob.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/ex_blob" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_blob.pch" AssemblerListingLocation="$(OutDir)/ex_blob/" ObjectFile="$(OutDir)/ex_blob/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_blob.exe" ProgramDatabaseFile="$(OutDir)/ex_blob.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + </Configurations> + <References/> + <Files> + <File RelativePath="..\..\src\clib\getopt.c"/> + <File RelativePath="..\..\examples\c\ex_blob.c"/> + </Files> + <Globals/> +</VisualStudioProject> diff --git a/build_windows/VS8/ex_btrec.vcproj b/build_windows/VS8/ex_btrec.vcproj index 2a90eec6..3e6cb31f 100644 --- a/build_windows/VS8/ex_btrec.vcproj +++ b/build_windows/VS8/ex_btrec.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_btrec.pch" AssemblerListingLocation="$(OutDir)/ex_btrec/" ObjectFile="$(OutDir)/ex_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_btrec.pch" AssemblerListingLocation="$(OutDir)/ex_btrec/" ObjectFile="$(OutDir)/ex_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_btrec.pch" AssemblerListingLocation="$(OutDir)/ex_btrec/" ObjectFile="$(OutDir)/ex_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_btrec.pch" AssemblerListingLocation="$(OutDir)/ex_btrec/" ObjectFile="$(OutDir)/ex_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_btrec.exe" ProgramDatabaseFile="$(OutDir)/ex_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_bulk.vcproj b/build_windows/VS8/ex_bulk.vcproj index 74057bb1..1954ce18 100644 --- a/build_windows/VS8/ex_bulk.vcproj +++ b/build_windows/VS8/ex_bulk.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_bulk.pch" AssemblerListingLocation="$(OutDir)/ex_bulk/" ObjectFile="$(OutDir)/ex_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_bulk.pch" AssemblerListingLocation="$(OutDir)/ex_bulk/" ObjectFile="$(OutDir)/ex_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_bulk.pch" AssemblerListingLocation="$(OutDir)/ex_bulk/" ObjectFile="$(OutDir)/ex_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_bulk.pch" AssemblerListingLocation="$(OutDir)/ex_bulk/" ObjectFile="$(OutDir)/ex_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_bulk.exe" ProgramDatabaseFile="$(OutDir)/ex_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_csvcode.vcproj b/build_windows/VS8/ex_csvcode.vcproj index 714d378f..89081992 100644 --- a/build_windows/VS8/ex_csvcode.vcproj +++ b/build_windows/VS8/ex_csvcode.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvcode.pch" AssemblerListingLocation="$(OutDir)/ex_csvcode/" ObjectFile="$(OutDir)/ex_csvcode/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool" CommandLine="$(OUTDIR)\ex_csvcode.exe -c ../../examples/c/csv/csv_local.c -h ../../examples/c/csv/csv_local.h -f ../../examples/c/csv/sample.desc" Description="Generate csv_local.{c|h} files."/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvcode.pch" AssemblerListingLocation="$(OutDir)/ex_csvcode/" ObjectFile="$(OutDir)/ex_csvcode/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool" CommandLine="$(OUTDIR)\ex_csvcode.exe -c ../../examples/c/csv/csv_local.c -h ../../examples/c/csv/csv_local.h -f ../../examples/c/csv/sample.desc" Description="Generate csv_local.{c|h} files."/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvcode.pch" AssemblerListingLocation="$(OutDir)/ex_csvcode/" ObjectFile="$(OutDir)/ex_csvcode/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool" CommandLine="$(OUTDIR)\ex_csvcode.exe -c ../../examples/c/csv/csv_local.c -h ../../examples/c/csv/csv_local.h -f ../../examples/c/csv/sample.desc" Description="Generate csv_local.{c|h} files."/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvcode.pch" AssemblerListingLocation="$(OutDir)/ex_csvcode/" ObjectFile="$(OutDir)/ex_csvcode/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvcode.exe" ProgramDatabaseFile="$(OutDir)/ex_csvcode.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool" CommandLine="$(OUTDIR)\ex_csvcode.exe -c ../../examples/c/csv/csv_local.c -h ../../examples/c/csv/csv_local.h -f ../../examples/c/csv/sample.desc" Description="Generate csv_local.{c|h} files."/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_csvload.vcproj b/build_windows/VS8/ex_csvload.vcproj index 52bf2988..87186086 100644 --- a/build_windows/VS8/ex_csvload.vcproj +++ b/build_windows/VS8/ex_csvload.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvload.pch" AssemblerListingLocation="$(OutDir)/ex_csvload/" ObjectFile="$(OutDir)/ex_csvload/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvload.pch" AssemblerListingLocation="$(OutDir)/ex_csvload/" ObjectFile="$(OutDir)/ex_csvload/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvload.pch" AssemblerListingLocation="$(OutDir)/ex_csvload/" ObjectFile="$(OutDir)/ex_csvload/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvload.pch" AssemblerListingLocation="$(OutDir)/ex_csvload/" ObjectFile="$(OutDir)/ex_csvload/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvload.exe" ProgramDatabaseFile="$(OutDir)/ex_csvload.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_csvquery.vcproj b/build_windows/VS8/ex_csvquery.vcproj index 69cb05d6..6c034968 100644 --- a/build_windows/VS8/ex_csvquery.vcproj +++ b/build_windows/VS8/ex_csvquery.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvquery.pch" AssemblerListingLocation="$(OutDir)/ex_csvquery/" ObjectFile="$(OutDir)/ex_csvquery/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvquery.pch" AssemblerListingLocation="$(OutDir)/ex_csvquery/" ObjectFile="$(OutDir)/ex_csvquery/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvquery.pch" AssemblerListingLocation="$(OutDir)/ex_csvquery/" ObjectFile="$(OutDir)/ex_csvquery/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_csvquery.pch" AssemblerListingLocation="$(OutDir)/ex_csvquery/" ObjectFile="$(OutDir)/ex_csvquery/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_csvquery.exe" ProgramDatabaseFile="$(OutDir)/ex_csvquery.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_env.vcproj b/build_windows/VS8/ex_env.vcproj index 0628b59c..7500ee77 100644 --- a/build_windows/VS8/ex_env.vcproj +++ b/build_windows/VS8/ex_env.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_env.pch" AssemblerListingLocation="$(OutDir)/ex_env/" ObjectFile="$(OutDir)/ex_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_env.pch" AssemblerListingLocation="$(OutDir)/ex_env/" ObjectFile="$(OutDir)/ex_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_env.pch" AssemblerListingLocation="$(OutDir)/ex_env/" ObjectFile="$(OutDir)/ex_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_env.pch" AssemblerListingLocation="$(OutDir)/ex_env/" ObjectFile="$(OutDir)/ex_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_env.exe" ProgramDatabaseFile="$(OutDir)/ex_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_heap.vcproj b/build_windows/VS8/ex_heap.vcproj index 33f84e06..27c7b88c 100644 --- a/build_windows/VS8/ex_heap.vcproj +++ b/build_windows/VS8/ex_heap.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_heap.pch" AssemblerListingLocation="$(OutDir)/ex_heap/" ObjectFile="$(OutDir)/ex_heap/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_heap.pch" AssemblerListingLocation="$(OutDir)/ex_heap/" ObjectFile="$(OutDir)/ex_heap/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_heap.pch" AssemblerListingLocation="$(OutDir)/ex_heap/" ObjectFile="$(OutDir)/ex_heap/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_heap.pch" AssemblerListingLocation="$(OutDir)/ex_heap/" ObjectFile="$(OutDir)/ex_heap/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_heap.exe" ProgramDatabaseFile="$(OutDir)/ex_heap.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_java.vcproj b/build_windows/VS8/ex_java.vcproj index 49da48fc..1481851e 100644 --- a/build_windows/VS8/ex_java.vcproj +++ b/build_windows/VS8/ex_java.vcproj @@ -14,7 +14,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/ex_java.exe" ProgramDatabaseFile="$(OutDir)/ex_java.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> <Configuration Name="Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/ex_java" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -25,7 +25,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/ex_java.exe" ProgramDatabaseFile="$(OutDir)/ex_java.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/ex_java" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -36,7 +36,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/ex_java.exe" ProgramDatabaseFile="$(OutDir)/ex_java.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> <Configuration Name="Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/ex_java" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> @@ -47,7 +47,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="" AdditionalLibraryDirectories="../../lib" OutputFile="$(OutDir)/ex_java.exe" ProgramDatabaseFile="$(OutDir)/ex_java.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> - <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -target 1.5 -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
jar cf "$(OutDir)/dbexamples.jar" -C "$(OutDir)\classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> + <Tool Name="VCCustomBuildTool" CommandLine="
echo compiling examples
mkdir "$(OutDir)\classes.ex"
javac -g -d "$(OutDir)\classes.ex" -classpath "$(OutDir)\classes;$(OutDir)\classes.ex" ..\..\examples/java\src\db\*.java ..\..\examples/java\src\db\GettingStarted\*.java ..\..\examples/java\src\db\repquote\*.java ..\..\examples/java\src\db\repquote_gsg\*.java ..\..\examples/java\src\db\txn\*.java ..\..\examples/java\src\collections\access\*.java ..\..\examples/java\src\collections\hello\*.java ..\..\examples/java\src\collections\ship\basic\*.java ..\..\examples/java\src\collections\ship\entity\*.java ..\..\examples/java\src\collections\ship\factory\*.java ..\..\examples/java\src\collections\ship\index\*.java ..\..\examples/java\src\collections\ship\marshal\*.java ..\..\examples/java\src\collections\ship\sentity\*.java ..\..\examples/java\src\collections\ship\tuple\*.java ..\..\examples/java\src\persist\*.java ..\..\examples/java\src\persist\gettingStarted\*.java ..\..\examples/java\src\persist\txn\*.java
echo creating jar files
cd $(OutDir)
jar cf "dbexamples.jar" -C "classes.ex" .
echo Java example build finished" Outputs="force_compilation.txt"/></Configuration> </Configurations> <References/> <Files> diff --git a/build_windows/VS8/ex_lock.vcproj b/build_windows/VS8/ex_lock.vcproj index 41bb3a75..cc9dfb65 100644 --- a/build_windows/VS8/ex_lock.vcproj +++ b/build_windows/VS8/ex_lock.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_lock.pch" AssemblerListingLocation="$(OutDir)/ex_lock/" ObjectFile="$(OutDir)/ex_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_lock.pch" AssemblerListingLocation="$(OutDir)/ex_lock/" ObjectFile="$(OutDir)/ex_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_lock.pch" AssemblerListingLocation="$(OutDir)/ex_lock/" ObjectFile="$(OutDir)/ex_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_lock.pch" AssemblerListingLocation="$(OutDir)/ex_lock/" ObjectFile="$(OutDir)/ex_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_lock.exe" ProgramDatabaseFile="$(OutDir)/ex_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_mpool.vcproj b/build_windows/VS8/ex_mpool.vcproj index 1196b5fd..3ddc0419 100644 --- a/build_windows/VS8/ex_mpool.vcproj +++ b/build_windows/VS8/ex_mpool.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_mpool.pch" AssemblerListingLocation="$(OutDir)/ex_mpool/" ObjectFile="$(OutDir)/ex_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_mpool.pch" AssemblerListingLocation="$(OutDir)/ex_mpool/" ObjectFile="$(OutDir)/ex_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_mpool.pch" AssemblerListingLocation="$(OutDir)/ex_mpool/" ObjectFile="$(OutDir)/ex_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_mpool.pch" AssemblerListingLocation="$(OutDir)/ex_mpool/" ObjectFile="$(OutDir)/ex_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_mpool.exe" ProgramDatabaseFile="$(OutDir)/ex_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_rep_base.vcproj b/build_windows/VS8/ex_rep_base.vcproj index 61b0e921..640a848c 100644 --- a/build_windows/VS8/ex_rep_base.vcproj +++ b/build_windows/VS8/ex_rep_base.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_base.pch" AssemblerListingLocation="$(OutDir)/ex_rep_base/" ObjectFile="$(OutDir)/ex_rep_base/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_base.pch" AssemblerListingLocation="$(OutDir)/ex_rep_base/" ObjectFile="$(OutDir)/ex_rep_base/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_base.pch" AssemblerListingLocation="$(OutDir)/ex_rep_base/" ObjectFile="$(OutDir)/ex_rep_base/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_base.pch" AssemblerListingLocation="$(OutDir)/ex_rep_base/" ObjectFile="$(OutDir)/ex_rep_base/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_base.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_base.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_rep_chan.vcproj b/build_windows/VS8/ex_rep_chan.vcproj index 8a5a3bae..802df344 100644 --- a/build_windows/VS8/ex_rep_chan.vcproj +++ b/build_windows/VS8/ex_rep_chan.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_chan.pch" AssemblerListingLocation="$(OutDir)/ex_rep_chan/" ObjectFile="$(OutDir)/ex_rep_chan/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_chan.pch" AssemblerListingLocation="$(OutDir)/ex_rep_chan/" ObjectFile="$(OutDir)/ex_rep_chan/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_chan.pch" AssemblerListingLocation="$(OutDir)/ex_rep_chan/" ObjectFile="$(OutDir)/ex_rep_chan/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_chan.pch" AssemblerListingLocation="$(OutDir)/ex_rep_chan/" ObjectFile="$(OutDir)/ex_rep_chan/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_chan.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_chan.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_rep_mgr.vcproj b/build_windows/VS8/ex_rep_mgr.vcproj index 27cc6377..6bdfd62e 100644 --- a/build_windows/VS8/ex_rep_mgr.vcproj +++ b/build_windows/VS8/ex_rep_mgr.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_mgr.pch" AssemblerListingLocation="$(OutDir)/ex_rep_mgr/" ObjectFile="$(OutDir)/ex_rep_mgr/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_mgr.pch" AssemblerListingLocation="$(OutDir)/ex_rep_mgr/" ObjectFile="$(OutDir)/ex_rep_mgr/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_mgr.pch" AssemblerListingLocation="$(OutDir)/ex_rep_mgr/" ObjectFile="$(OutDir)/ex_rep_mgr/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_rep_mgr.pch" AssemblerListingLocation="$(OutDir)/ex_rep_mgr/" ObjectFile="$(OutDir)/ex_rep_mgr/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_rep_mgr.exe" ProgramDatabaseFile="$(OutDir)/ex_rep_mgr.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sequence.vcproj b/build_windows/VS8/ex_sequence.vcproj index 07a2af87..2ecdcf08 100644 --- a/build_windows/VS8/ex_sequence.vcproj +++ b/build_windows/VS8/ex_sequence.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sequence.pch" AssemblerListingLocation="$(OutDir)/ex_sequence/" ObjectFile="$(OutDir)/ex_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sequence.pch" AssemblerListingLocation="$(OutDir)/ex_sequence/" ObjectFile="$(OutDir)/ex_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sequence.pch" AssemblerListingLocation="$(OutDir)/ex_sequence/" ObjectFile="$(OutDir)/ex_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sequence.pch" AssemblerListingLocation="$(OutDir)/ex_sequence/" ObjectFile="$(OutDir)/ex_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sequence.exe" ProgramDatabaseFile="$(OutDir)/ex_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_binding.vcproj b/build_windows/VS8/ex_sql_binding.vcproj index 30364649..81a6a0ac 100644 --- a/build_windows/VS8/ex_sql_binding.vcproj +++ b/build_windows/VS8/ex_sql_binding.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_binding.pch" AssemblerListingLocation="$(OutDir)/ex_sql_binding/" ObjectFile="$(OutDir)/ex_sql_binding/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_binding.pch" AssemblerListingLocation="$(OutDir)/ex_sql_binding/" ObjectFile="$(OutDir)/ex_sql_binding/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_binding.pch" AssemblerListingLocation="$(OutDir)/ex_sql_binding/" ObjectFile="$(OutDir)/ex_sql_binding/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_binding.pch" AssemblerListingLocation="$(OutDir)/ex_sql_binding/" ObjectFile="$(OutDir)/ex_sql_binding/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_binding.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_binding.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_fts3.vcproj b/build_windows/VS8/ex_sql_fts3.vcproj index b716f32a..9e58eb3d 100644 --- a/build_windows/VS8/ex_sql_fts3.vcproj +++ b/build_windows/VS8/ex_sql_fts3.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_fts3.pch" AssemblerListingLocation="$(OutDir)/ex_sql_fts3/" ObjectFile="$(OutDir)/ex_sql_fts3/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_fts3.pch" AssemblerListingLocation="$(OutDir)/ex_sql_fts3/" ObjectFile="$(OutDir)/ex_sql_fts3/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_fts3.pch" AssemblerListingLocation="$(OutDir)/ex_sql_fts3/" ObjectFile="$(OutDir)/ex_sql_fts3/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_fts3.pch" AssemblerListingLocation="$(OutDir)/ex_sql_fts3/" ObjectFile="$(OutDir)/ex_sql_fts3/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_fts3.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_fts3.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_index.vcproj b/build_windows/VS8/ex_sql_index.vcproj index 6e27dbf4..d76022cb 100644 --- a/build_windows/VS8/ex_sql_index.vcproj +++ b/build_windows/VS8/ex_sql_index.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_index.pch" AssemblerListingLocation="$(OutDir)/ex_sql_index/" ObjectFile="$(OutDir)/ex_sql_index/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_index.pch" AssemblerListingLocation="$(OutDir)/ex_sql_index/" ObjectFile="$(OutDir)/ex_sql_index/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_index.pch" AssemblerListingLocation="$(OutDir)/ex_sql_index/" ObjectFile="$(OutDir)/ex_sql_index/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_index.pch" AssemblerListingLocation="$(OutDir)/ex_sql_index/" ObjectFile="$(OutDir)/ex_sql_index/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_index.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_index.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_load.vcproj b/build_windows/VS8/ex_sql_load.vcproj index 5dc070c5..b1c661b5 100644 --- a/build_windows/VS8/ex_sql_load.vcproj +++ b/build_windows/VS8/ex_sql_load.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_load.pch" AssemblerListingLocation="$(OutDir)/ex_sql_load/" ObjectFile="$(OutDir)/ex_sql_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_load.pch" AssemblerListingLocation="$(OutDir)/ex_sql_load/" ObjectFile="$(OutDir)/ex_sql_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_load.pch" AssemblerListingLocation="$(OutDir)/ex_sql_load/" ObjectFile="$(OutDir)/ex_sql_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_load.pch" AssemblerListingLocation="$(OutDir)/ex_sql_load/" ObjectFile="$(OutDir)/ex_sql_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_load.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_multi_thread.vcproj b/build_windows/VS8/ex_sql_multi_thread.vcproj index 5093d613..031b8d9c 100644 --- a/build_windows/VS8/ex_sql_multi_thread.vcproj +++ b/build_windows/VS8/ex_sql_multi_thread.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_multi_thread.pch" AssemblerListingLocation="$(OutDir)/ex_sql_multi_thread/" ObjectFile="$(OutDir)/ex_sql_multi_thread/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_multi_thread.pch" AssemblerListingLocation="$(OutDir)/ex_sql_multi_thread/" ObjectFile="$(OutDir)/ex_sql_multi_thread/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_multi_thread.pch" AssemblerListingLocation="$(OutDir)/ex_sql_multi_thread/" ObjectFile="$(OutDir)/ex_sql_multi_thread/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_multi_thread.pch" AssemblerListingLocation="$(OutDir)/ex_sql_multi_thread/" ObjectFile="$(OutDir)/ex_sql_multi_thread/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_multi_thread.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_multi_thread.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_query.vcproj b/build_windows/VS8/ex_sql_query.vcproj index 6c4c74b1..4b81c9b2 100644 --- a/build_windows/VS8/ex_sql_query.vcproj +++ b/build_windows/VS8/ex_sql_query.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_query.pch" AssemblerListingLocation="$(OutDir)/ex_sql_query/" ObjectFile="$(OutDir)/ex_sql_query/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_query.pch" AssemblerListingLocation="$(OutDir)/ex_sql_query/" ObjectFile="$(OutDir)/ex_sql_query/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_query.pch" AssemblerListingLocation="$(OutDir)/ex_sql_query/" ObjectFile="$(OutDir)/ex_sql_query/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_query.pch" AssemblerListingLocation="$(OutDir)/ex_sql_query/" ObjectFile="$(OutDir)/ex_sql_query/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_query.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_query.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_rtree.vcproj b/build_windows/VS8/ex_sql_rtree.vcproj index 2a0f7613..393c3e96 100644 --- a/build_windows/VS8/ex_sql_rtree.vcproj +++ b/build_windows/VS8/ex_sql_rtree.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_rtree.pch" AssemblerListingLocation="$(OutDir)/ex_sql_rtree/" ObjectFile="$(OutDir)/ex_sql_rtree/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_rtree.pch" AssemblerListingLocation="$(OutDir)/ex_sql_rtree/" ObjectFile="$(OutDir)/ex_sql_rtree/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_rtree.pch" AssemblerListingLocation="$(OutDir)/ex_sql_rtree/" ObjectFile="$(OutDir)/ex_sql_rtree/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_rtree.pch" AssemblerListingLocation="$(OutDir)/ex_sql_rtree/" ObjectFile="$(OutDir)/ex_sql_rtree/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_rtree.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_rtree.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_savepoint.vcproj b/build_windows/VS8/ex_sql_savepoint.vcproj index d9af0671..45d77c8b 100644 --- a/build_windows/VS8/ex_sql_savepoint.vcproj +++ b/build_windows/VS8/ex_sql_savepoint.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_savepoint.pch" AssemblerListingLocation="$(OutDir)/ex_sql_savepoint/" ObjectFile="$(OutDir)/ex_sql_savepoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_savepoint.pch" AssemblerListingLocation="$(OutDir)/ex_sql_savepoint/" ObjectFile="$(OutDir)/ex_sql_savepoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_savepoint.pch" AssemblerListingLocation="$(OutDir)/ex_sql_savepoint/" ObjectFile="$(OutDir)/ex_sql_savepoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_savepoint.pch" AssemblerListingLocation="$(OutDir)/ex_sql_savepoint/" ObjectFile="$(OutDir)/ex_sql_savepoint/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_savepoint.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_savepoint.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_statement.vcproj b/build_windows/VS8/ex_sql_statement.vcproj index a033b635..2dc28b49 100644 --- a/build_windows/VS8/ex_sql_statement.vcproj +++ b/build_windows/VS8/ex_sql_statement.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_statement.pch" AssemblerListingLocation="$(OutDir)/ex_sql_statement/" ObjectFile="$(OutDir)/ex_sql_statement/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_statement.pch" AssemblerListingLocation="$(OutDir)/ex_sql_statement/" ObjectFile="$(OutDir)/ex_sql_statement/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_statement.pch" AssemblerListingLocation="$(OutDir)/ex_sql_statement/" ObjectFile="$(OutDir)/ex_sql_statement/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_statement.pch" AssemblerListingLocation="$(OutDir)/ex_sql_statement/" ObjectFile="$(OutDir)/ex_sql_statement/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_statement.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_statement.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_sql_transaction.vcproj b/build_windows/VS8/ex_sql_transaction.vcproj index 1e211d14..0dad3e09 100644 --- a/build_windows/VS8/ex_sql_transaction.vcproj +++ b/build_windows/VS8/ex_sql_transaction.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_transaction.pch" AssemblerListingLocation="$(OutDir)/ex_sql_transaction/" ObjectFile="$(OutDir)/ex_sql_transaction/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_transaction.pch" AssemblerListingLocation="$(OutDir)/ex_sql_transaction/" ObjectFile="$(OutDir)/ex_sql_transaction/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_transaction.pch" AssemblerListingLocation="$(OutDir)/ex_sql_transaction/" ObjectFile="$(OutDir)/ex_sql_transaction/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../lang/sql/generated,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_sql_transaction.pch" AssemblerListingLocation="$(OutDir)/ex_sql_transaction/" ObjectFile="$(OutDir)/ex_sql_transaction/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb_sql61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_sql_transaction.exe" ProgramDatabaseFile="$(OutDir)/ex_sql_transaction.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_stream.vcproj b/build_windows/VS8/ex_stream.vcproj index e7e6fc6e..595d483a 100644 --- a/build_windows/VS8/ex_stream.vcproj +++ b/build_windows/VS8/ex_stream.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_stream.pch" AssemblerListingLocation="$(OutDir)/ex_stream/" ObjectFile="$(OutDir)/ex_stream/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_stream.pch" AssemblerListingLocation="$(OutDir)/ex_stream/" ObjectFile="$(OutDir)/ex_stream/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_stream.pch" AssemblerListingLocation="$(OutDir)/ex_stream/" ObjectFile="$(OutDir)/ex_stream/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_stream.pch" AssemblerListingLocation="$(OutDir)/ex_stream/" ObjectFile="$(OutDir)/ex_stream/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_stream.exe" ProgramDatabaseFile="$(OutDir)/ex_stream.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_tpcb.vcproj b/build_windows/VS8/ex_tpcb.vcproj index 879d4b48..7ac1868e 100644 --- a/build_windows/VS8/ex_tpcb.vcproj +++ b/build_windows/VS8/ex_tpcb.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_tpcb.pch" AssemblerListingLocation="$(OutDir)/ex_tpcb/" ObjectFile="$(OutDir)/ex_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_tpcb.pch" AssemblerListingLocation="$(OutDir)/ex_tpcb/" ObjectFile="$(OutDir)/ex_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_tpcb.pch" AssemblerListingLocation="$(OutDir)/ex_tpcb/" ObjectFile="$(OutDir)/ex_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_tpcb.pch" AssemblerListingLocation="$(OutDir)/ex_tpcb/" ObjectFile="$(OutDir)/ex_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_tpcb.exe" ProgramDatabaseFile="$(OutDir)/ex_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_txnguide.vcproj b/build_windows/VS8/ex_txnguide.vcproj index 49607b3c..21c1899f 100644 --- a/build_windows/VS8/ex_txnguide.vcproj +++ b/build_windows/VS8/ex_txnguide.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide/" ObjectFile="$(OutDir)/ex_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide/" ObjectFile="$(OutDir)/ex_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide/" ObjectFile="$(OutDir)/ex_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide/" ObjectFile="$(OutDir)/ex_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/ex_txnguide_inmem.vcproj b/build_windows/VS8/ex_txnguide_inmem.vcproj index 51deec48..cc99d08e 100644 --- a/build_windows/VS8/ex_txnguide_inmem.vcproj +++ b/build_windows/VS8/ex_txnguide_inmem.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide_inmem/" ObjectFile="$(OutDir)/ex_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide_inmem/" ObjectFile="$(OutDir)/ex_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide_inmem/" ObjectFile="$(OutDir)/ex_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/ex_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/ex_txnguide_inmem/" ObjectFile="$(OutDir)/ex_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/ex_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/ex_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/example_database_load.vcproj b/build_windows/VS8/example_database_load.vcproj index ce09b783..3ad5d8cf 100644 --- a/build_windows/VS8/example_database_load.vcproj +++ b/build_windows/VS8/example_database_load.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_load.pch" AssemblerListingLocation="$(OutDir)/example_database_load/" ObjectFile="$(OutDir)/example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_load.pch" AssemblerListingLocation="$(OutDir)/example_database_load/" ObjectFile="$(OutDir)/example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_load.pch" AssemblerListingLocation="$(OutDir)/example_database_load/" ObjectFile="$(OutDir)/example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_load.pch" AssemblerListingLocation="$(OutDir)/example_database_load/" ObjectFile="$(OutDir)/example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_load.exe" ProgramDatabaseFile="$(OutDir)/example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/example_database_read.vcproj b/build_windows/VS8/example_database_read.vcproj index 1bc9bc2a..4d992367 100644 --- a/build_windows/VS8/example_database_read.vcproj +++ b/build_windows/VS8/example_database_read.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_read.pch" AssemblerListingLocation="$(OutDir)/example_database_read/" ObjectFile="$(OutDir)/example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_read.pch" AssemblerListingLocation="$(OutDir)/example_database_read/" ObjectFile="$(OutDir)/example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_read.pch" AssemblerListingLocation="$(OutDir)/example_database_read/" ObjectFile="$(OutDir)/example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/example_database_read.pch" AssemblerListingLocation="$(OutDir)/example_database_read/" ObjectFile="$(OutDir)/example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/example_database_read.exe" ProgramDatabaseFile="$(OutDir)/example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_access.vcproj b/build_windows/VS8/excxx_access.vcproj index 488558cc..a033db6c 100644 --- a/build_windows/VS8/excxx_access.vcproj +++ b/build_windows/VS8/excxx_access.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_access.pch" AssemblerListingLocation="$(OutDir)/excxx_access/" ObjectFile="$(OutDir)/excxx_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_access.pch" AssemblerListingLocation="$(OutDir)/excxx_access/" ObjectFile="$(OutDir)/excxx_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_access.pch" AssemblerListingLocation="$(OutDir)/excxx_access/" ObjectFile="$(OutDir)/excxx_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_access.pch" AssemblerListingLocation="$(OutDir)/excxx_access/" ObjectFile="$(OutDir)/excxx_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_access.exe" ProgramDatabaseFile="$(OutDir)/excxx_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_btrec.vcproj b/build_windows/VS8/excxx_btrec.vcproj index eabdc94b..3c8efbe9 100644 --- a/build_windows/VS8/excxx_btrec.vcproj +++ b/build_windows/VS8/excxx_btrec.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_btrec.pch" AssemblerListingLocation="$(OutDir)/excxx_btrec/" ObjectFile="$(OutDir)/excxx_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_btrec.pch" AssemblerListingLocation="$(OutDir)/excxx_btrec/" ObjectFile="$(OutDir)/excxx_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_btrec.pch" AssemblerListingLocation="$(OutDir)/excxx_btrec/" ObjectFile="$(OutDir)/excxx_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_btrec.pch" AssemblerListingLocation="$(OutDir)/excxx_btrec/" ObjectFile="$(OutDir)/excxx_btrec/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_btrec.exe" ProgramDatabaseFile="$(OutDir)/excxx_btrec.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_bulk.vcproj b/build_windows/VS8/excxx_bulk.vcproj new file mode 100644 index 00000000..58767213 --- /dev/null +++ b/build_windows/VS8/excxx_bulk.vcproj @@ -0,0 +1,58 @@ +<VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="excxx_bulk" ProjectGUID="{5AEBE8D9-4B6D-46AA-B810-30CD7E6BBD5F}"> + <Platforms> + <Platform Name="Win32"/> + <Platform Name="x64"/> + </Platforms> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/excxx_bulk" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_bulk.pch" AssemblerListingLocation="$(OutDir)/excxx_bulk/" ObjectFile="$(OutDir)/excxx_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_bulk.exe" ProgramDatabaseFile="$(OutDir)/excxx_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Release|Win32" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/excxx_bulk" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_bulk.pch" AssemblerListingLocation="$(OutDir)/excxx_bulk/" ObjectFile="$(OutDir)/excxx_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_bulk.exe" ProgramDatabaseFile="$(OutDir)/excxx_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Debug|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Debug" IntermediateDirectory="./$(OutDir)/excxx_bulk" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_bulk.pch" AssemblerListingLocation="$(OutDir)/excxx_bulk/" ObjectFile="$(OutDir)/excxx_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_bulk.exe" ProgramDatabaseFile="$(OutDir)/excxx_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + <Configuration Name="Release|x64" OutputDirectory="..\..\build_windows\$(PlatformName)\Release" IntermediateDirectory="./$(OutDir)/excxx_bulk" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> + <Tool Name="VCPreLinkEventTool"/> + <Tool Name="VCResourceCompilerTool"/> + <Tool Name="VCXMLDataGeneratorTool"/> + <Tool Name="VCManagedWrapperGeneratorTool"/> + <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_bulk.pch" AssemblerListingLocation="$(OutDir)/excxx_bulk/" ObjectFile="$(OutDir)/excxx_bulk/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_bulk.exe" ProgramDatabaseFile="$(OutDir)/excxx_bulk.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCPreBuildEventTool"/> + <Tool Name="VCPostBuildEventTool"/> + <Tool Name="VCCustomBuildTool"/></Configuration> + </Configurations> + <References/> + <Files> + <File RelativePath="..\..\src\clib\getopt.c"/> + <File RelativePath="..\..\examples\cxx\BulkExample.cpp"/> + </Files> + <Globals/> +</VisualStudioProject> diff --git a/build_windows/VS8/excxx_env.vcproj b/build_windows/VS8/excxx_env.vcproj index cc70255d..c4f335d9 100644 --- a/build_windows/VS8/excxx_env.vcproj +++ b/build_windows/VS8/excxx_env.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_env.pch" AssemblerListingLocation="$(OutDir)/excxx_env/" ObjectFile="$(OutDir)/excxx_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_env.pch" AssemblerListingLocation="$(OutDir)/excxx_env/" ObjectFile="$(OutDir)/excxx_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_env.pch" AssemblerListingLocation="$(OutDir)/excxx_env/" ObjectFile="$(OutDir)/excxx_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_env.pch" AssemblerListingLocation="$(OutDir)/excxx_env/" ObjectFile="$(OutDir)/excxx_env/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_env.exe" ProgramDatabaseFile="$(OutDir)/excxx_env.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_example_database_load.vcproj b/build_windows/VS8/excxx_example_database_load.vcproj index 0fedf81f..eefd1d52 100644 --- a/build_windows/VS8/excxx_example_database_load.vcproj +++ b/build_windows/VS8/excxx_example_database_load.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_load.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_load/" ObjectFile="$(OutDir)/excxx_example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_load.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_load/" ObjectFile="$(OutDir)/excxx_example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_load.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_load/" ObjectFile="$(OutDir)/excxx_example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_load.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_load/" ObjectFile="$(OutDir)/excxx_example_database_load/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_load.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_load.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_example_database_read.vcproj b/build_windows/VS8/excxx_example_database_read.vcproj index 3df6b06e..23f7bef4 100644 --- a/build_windows/VS8/excxx_example_database_read.vcproj +++ b/build_windows/VS8/excxx_example_database_read.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_read.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_read/" ObjectFile="$(OutDir)/excxx_example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_read.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_read/" ObjectFile="$(OutDir)/excxx_example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_read.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_read/" ObjectFile="$(OutDir)/excxx_example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_example_database_read.pch" AssemblerListingLocation="$(OutDir)/excxx_example_database_read/" ObjectFile="$(OutDir)/excxx_example_database_read/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_example_database_read.exe" ProgramDatabaseFile="$(OutDir)/excxx_example_database_read.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_lock.vcproj b/build_windows/VS8/excxx_lock.vcproj index daa7dfa6..aeaf2bb4 100644 --- a/build_windows/VS8/excxx_lock.vcproj +++ b/build_windows/VS8/excxx_lock.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_lock.pch" AssemblerListingLocation="$(OutDir)/excxx_lock/" ObjectFile="$(OutDir)/excxx_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_lock.pch" AssemblerListingLocation="$(OutDir)/excxx_lock/" ObjectFile="$(OutDir)/excxx_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_lock.pch" AssemblerListingLocation="$(OutDir)/excxx_lock/" ObjectFile="$(OutDir)/excxx_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_lock.pch" AssemblerListingLocation="$(OutDir)/excxx_lock/" ObjectFile="$(OutDir)/excxx_lock/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_lock.exe" ProgramDatabaseFile="$(OutDir)/excxx_lock.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_mpool.vcproj b/build_windows/VS8/excxx_mpool.vcproj index f8a2cc14..872dcb07 100644 --- a/build_windows/VS8/excxx_mpool.vcproj +++ b/build_windows/VS8/excxx_mpool.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_mpool.pch" AssemblerListingLocation="$(OutDir)/excxx_mpool/" ObjectFile="$(OutDir)/excxx_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_mpool.pch" AssemblerListingLocation="$(OutDir)/excxx_mpool/" ObjectFile="$(OutDir)/excxx_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_mpool.pch" AssemblerListingLocation="$(OutDir)/excxx_mpool/" ObjectFile="$(OutDir)/excxx_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_mpool.pch" AssemblerListingLocation="$(OutDir)/excxx_mpool/" ObjectFile="$(OutDir)/excxx_mpool/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_mpool.exe" ProgramDatabaseFile="$(OutDir)/excxx_mpool.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_repquote.vcproj b/build_windows/VS8/excxx_repquote.vcproj index 209acb84..94ca7586 100644 --- a/build_windows/VS8/excxx_repquote.vcproj +++ b/build_windows/VS8/excxx_repquote.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_repquote.pch" AssemblerListingLocation="$(OutDir)/excxx_repquote/" ObjectFile="$(OutDir)/excxx_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_repquote.pch" AssemblerListingLocation="$(OutDir)/excxx_repquote/" ObjectFile="$(OutDir)/excxx_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_repquote.pch" AssemblerListingLocation="$(OutDir)/excxx_repquote/" ObjectFile="$(OutDir)/excxx_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_repquote.pch" AssemblerListingLocation="$(OutDir)/excxx_repquote/" ObjectFile="$(OutDir)/excxx_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_repquote.exe" ProgramDatabaseFile="$(OutDir)/excxx_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_sequence.vcproj b/build_windows/VS8/excxx_sequence.vcproj index cff1a723..d995f357 100644 --- a/build_windows/VS8/excxx_sequence.vcproj +++ b/build_windows/VS8/excxx_sequence.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_sequence.pch" AssemblerListingLocation="$(OutDir)/excxx_sequence/" ObjectFile="$(OutDir)/excxx_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_sequence.pch" AssemblerListingLocation="$(OutDir)/excxx_sequence/" ObjectFile="$(OutDir)/excxx_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_sequence.pch" AssemblerListingLocation="$(OutDir)/excxx_sequence/" ObjectFile="$(OutDir)/excxx_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_sequence.pch" AssemblerListingLocation="$(OutDir)/excxx_sequence/" ObjectFile="$(OutDir)/excxx_sequence/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_sequence.exe" ProgramDatabaseFile="$(OutDir)/excxx_sequence.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_tpcb.vcproj b/build_windows/VS8/excxx_tpcb.vcproj index 44326d28..83794f1c 100644 --- a/build_windows/VS8/excxx_tpcb.vcproj +++ b/build_windows/VS8/excxx_tpcb.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_tpcb.pch" AssemblerListingLocation="$(OutDir)/excxx_tpcb/" ObjectFile="$(OutDir)/excxx_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_tpcb.pch" AssemblerListingLocation="$(OutDir)/excxx_tpcb/" ObjectFile="$(OutDir)/excxx_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_tpcb.pch" AssemblerListingLocation="$(OutDir)/excxx_tpcb/" ObjectFile="$(OutDir)/excxx_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_tpcb.pch" AssemblerListingLocation="$(OutDir)/excxx_tpcb/" ObjectFile="$(OutDir)/excxx_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_tpcb.exe" ProgramDatabaseFile="$(OutDir)/excxx_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_txnguide.vcproj b/build_windows/VS8/excxx_txnguide.vcproj index 3244f826..7ca2f14b 100644 --- a/build_windows/VS8/excxx_txnguide.vcproj +++ b/build_windows/VS8/excxx_txnguide.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide/" ObjectFile="$(OutDir)/excxx_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide/" ObjectFile="$(OutDir)/excxx_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide/" ObjectFile="$(OutDir)/excxx_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide/" ObjectFile="$(OutDir)/excxx_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/excxx_txnguide_inmem.vcproj b/build_windows/VS8/excxx_txnguide_inmem.vcproj index fef80eb6..e12eba90 100644 --- a/build_windows/VS8/excxx_txnguide_inmem.vcproj +++ b/build_windows/VS8/excxx_txnguide_inmem.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide_inmem/" ObjectFile="$(OutDir)/excxx_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide_inmem/" ObjectFile="$(OutDir)/excxx_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide_inmem/" ObjectFile="$(OutDir)/excxx_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/excxx_txnguide_inmem.pch" AssemblerListingLocation="$(OutDir)/excxx_txnguide_inmem/" ObjectFile="$(OutDir)/excxx_txnguide_inmem/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/excxx_txnguide_inmem.exe" ProgramDatabaseFile="$(OutDir)/excxx_txnguide_inmem.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/exstl_access.vcproj b/build_windows/VS8/exstl_access.vcproj index d3d2bd3e..5788ff41 100644 --- a/build_windows/VS8/exstl_access.vcproj +++ b/build_windows/VS8/exstl_access.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_access.pch" AssemblerListingLocation="$(OutDir)/exstl_access/" ObjectFile="$(OutDir)/exstl_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_access.pch" AssemblerListingLocation="$(OutDir)/exstl_access/" ObjectFile="$(OutDir)/exstl_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_access.pch" AssemblerListingLocation="$(OutDir)/exstl_access/" ObjectFile="$(OutDir)/exstl_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_access.pch" AssemblerListingLocation="$(OutDir)/exstl_access/" ObjectFile="$(OutDir)/exstl_access/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_access.exe" ProgramDatabaseFile="$(OutDir)/exstl_access.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/exstl_advancedfeatures.vcproj b/build_windows/VS8/exstl_advancedfeatures.vcproj index 18143134..94929fb2 100644 --- a/build_windows/VS8/exstl_advancedfeatures.vcproj +++ b/build_windows/VS8/exstl_advancedfeatures.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_advancedfeatures.pch" AssemblerListingLocation="$(OutDir)/exstl_advancedfeatures/" ObjectFile="$(OutDir)/exstl_advancedfeatures/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_advancedfeatures.pch" AssemblerListingLocation="$(OutDir)/exstl_advancedfeatures/" ObjectFile="$(OutDir)/exstl_advancedfeatures/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_advancedfeatures.pch" AssemblerListingLocation="$(OutDir)/exstl_advancedfeatures/" ObjectFile="$(OutDir)/exstl_advancedfeatures/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_advancedfeatures.pch" AssemblerListingLocation="$(OutDir)/exstl_advancedfeatures/" ObjectFile="$(OutDir)/exstl_advancedfeatures/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_advancedfeatures.exe" ProgramDatabaseFile="$(OutDir)/exstl_advancedfeatures.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/exstl_repquote.vcproj b/build_windows/VS8/exstl_repquote.vcproj index 5a1eda47..e0d92e4c 100644 --- a/build_windows/VS8/exstl_repquote.vcproj +++ b/build_windows/VS8/exstl_repquote.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_repquote.pch" AssemblerListingLocation="$(OutDir)/exstl_repquote/" ObjectFile="$(OutDir)/exstl_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_repquote.pch" AssemblerListingLocation="$(OutDir)/exstl_repquote/" ObjectFile="$(OutDir)/exstl_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_repquote.pch" AssemblerListingLocation="$(OutDir)/exstl_repquote/" ObjectFile="$(OutDir)/exstl_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_repquote.pch" AssemblerListingLocation="$(OutDir)/exstl_repquote/" ObjectFile="$(OutDir)/exstl_repquote/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_repquote.exe" ProgramDatabaseFile="$(OutDir)/exstl_repquote.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/exstl_tpcb.vcproj b/build_windows/VS8/exstl_tpcb.vcproj index 49b562ea..372ef9b9 100644 --- a/build_windows/VS8/exstl_tpcb.vcproj +++ b/build_windows/VS8/exstl_tpcb.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_tpcb.pch" AssemblerListingLocation="$(OutDir)/exstl_tpcb/" ObjectFile="$(OutDir)/exstl_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_tpcb.pch" AssemblerListingLocation="$(OutDir)/exstl_tpcb/" ObjectFile="$(OutDir)/exstl_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_tpcb.pch" AssemblerListingLocation="$(OutDir)/exstl_tpcb/" ObjectFile="$(OutDir)/exstl_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_tpcb.pch" AssemblerListingLocation="$(OutDir)/exstl_tpcb/" ObjectFile="$(OutDir)/exstl_tpcb/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_tpcb.exe" ProgramDatabaseFile="$(OutDir)/exstl_tpcb.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/exstl_txnguide.vcproj b/build_windows/VS8/exstl_txnguide.vcproj index 90cd479a..ea2d8188 100644 --- a/build_windows/VS8/exstl_txnguide.vcproj +++ b/build_windows/VS8/exstl_txnguide.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_txnguide.pch" AssemblerListingLocation="$(OutDir)/exstl_txnguide/" ObjectFile="$(OutDir)/exstl_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_txnguide.pch" AssemblerListingLocation="$(OutDir)/exstl_txnguide/" ObjectFile="$(OutDir)/exstl_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_txnguide.pch" AssemblerListingLocation="$(OutDir)/exstl_txnguide/" ObjectFile="$(OutDir)/exstl_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/exstl_txnguide.pch" AssemblerListingLocation="$(OutDir)/exstl_txnguide/" ObjectFile="$(OutDir)/exstl_txnguide/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/exstl_txnguide.exe" ProgramDatabaseFile="$(OutDir)/exstl_txnguide.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/php_db4.vcproj b/build_windows/VS8/php_db4.vcproj index 6c2076d4..7d90db7b 100644 --- a/build_windows/VS8/php_db4.vcproj +++ b/build_windows/VS8/php_db4.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/php_db4.pch" AssemblerListingLocation="$(OutDir)/php_db4/" ObjectFile="$(OutDir)/php_db4/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4d.dll" ProgramDatabaseFile="$(OutDir)/php_db4d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4d.dll" ProgramDatabaseFile="$(OutDir)/php_db4d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=0;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/php_db4.pch" AssemblerListingLocation="$(OutDir)/php_db4/" ObjectFile="$(OutDir)/php_db4/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4.dll" ProgramDatabaseFile="$(OutDir)/php_db4.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4.dll" ProgramDatabaseFile="$(OutDir)/php_db4.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=1;_USRDLL" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/php_db4.pch" AssemblerListingLocation="$(OutDir)/php_db4/" ObjectFile="$(OutDir)/php_db4/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4d.dll" ProgramDatabaseFile="$(OutDir)/php_db4d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4d.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4d.dll" ProgramDatabaseFile="$(OutDir)/php_db4d.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4d.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;COMPILE_DL_DB4;DB4_EXPORTS;HAVE_DB_H=1;ZEND_WIN32=1;PHP_WIN32=1;ZEND_WIN32_FORCE_INLINE;ZTS=1;ZEND_DEBUG=0;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/php_db4.pch" AssemblerListingLocation="$(OutDir)/php_db4/" ObjectFile="$(OutDir)/php_db4/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4.dll" ProgramDatabaseFile="$(OutDir)/php_db4.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4.lib" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib .lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/php_db4.dll" ProgramDatabaseFile="$(OutDir)/php_db4.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" ImportLibrary="$(OutDir)/php_db4.lib" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/stl_test.vcproj b/build_windows/VS8/stl_test.vcproj index e4f5f8c4..80d83ef4 100644 --- a/build_windows/VS8/stl_test.vcproj +++ b/build_windows/VS8/stl_test.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test.pch" AssemblerListingLocation="$(OutDir)/stl_test/" ObjectFile="$(OutDir)/stl_test/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test.pch" AssemblerListingLocation="$(OutDir)/stl_test/" ObjectFile="$(OutDir)/stl_test/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test.pch" AssemblerListingLocation="$(OutDir)/stl_test/" ObjectFile="$(OutDir)/stl_test/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test.pch" AssemblerListingLocation="$(OutDir)/stl_test/" ObjectFile="$(OutDir)/stl_test/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test.exe" ProgramDatabaseFile="$(OutDir)/stl_test.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/stl_test_msexamples.vcproj b/build_windows/VS8/stl_test_msexamples.vcproj index 9b85294b..0a90686f 100644 --- a/build_windows/VS8/stl_test_msexamples.vcproj +++ b/build_windows/VS8/stl_test_msexamples.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_msexamples.pch" AssemblerListingLocation="$(OutDir)/stl_test_msexamples/" ObjectFile="$(OutDir)/stl_test_msexamples/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_msexamples.pch" AssemblerListingLocation="$(OutDir)/stl_test_msexamples/" ObjectFile="$(OutDir)/stl_test_msexamples/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_msexamples.pch" AssemblerListingLocation="$(OutDir)/stl_test_msexamples/" ObjectFile="$(OutDir)/stl_test_msexamples/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_msexamples.pch" AssemblerListingLocation="$(OutDir)/stl_test_msexamples/" ObjectFile="$(OutDir)/stl_test_msexamples/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_msexamples.exe" ProgramDatabaseFile="$(OutDir)/stl_test_msexamples.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/stl_test_stlport.vcproj b/build_windows/VS8/stl_test_stlport.vcproj index aeb669c5..daa89274 100644 --- a/build_windows/VS8/stl_test_stlport.vcproj +++ b/build_windows/VS8/stl_test_stlport.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_stlport.pch" AssemblerListingLocation="$(OutDir)/stl_test_stlport/" ObjectFile="$(OutDir)/stl_test_stlport/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_stlport.pch" AssemblerListingLocation="$(OutDir)/stl_test_stlport/" ObjectFile="$(OutDir)/stl_test_stlport/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_stlport.pch" AssemblerListingLocation="$(OutDir)/stl_test_stlport/" ObjectFile="$(OutDir)/stl_test_stlport/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib libdb_stl53d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib libdb_stl61d.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalOptions="/bigobj" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../lang/cxx/stl" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_SCL_SECURE_NO_WARNINGS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/stl_test_stlport.pch" AssemblerListingLocation="$(OutDir)/stl_test_stlport/" ObjectFile="$(OutDir)/stl_test_stlport/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib libdb_stl53.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib libdb_stl61.lib" AdditionalLibraryDirectories="$(OutDir);$(OutDir);../../lib" OutputFile="$(OutDir)/stl_test_stlport.exe" ProgramDatabaseFile="$(OutDir)/stl_test_stlport.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/test_cutest.vcproj b/build_windows/VS8/test_cutest.vcproj index d4ff3dca..375473cb 100644 --- a/build_windows/VS8/test_cutest.vcproj +++ b/build_windows/VS8/test_cutest.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../test/c/cutest,../../test/c/suite,../../test/c/common" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;TEST_HARNESS_C;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_cutest.pch" AssemblerListingLocation="$(OutDir)/test_cutest/" ObjectFile="$(OutDir)/test_cutest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../test/c/cutest,../../test/c/suite,../../test/c/common" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;TEST_HARNESS_C;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_cutest.pch" AssemblerListingLocation="$(OutDir)/test_cutest/" ObjectFile="$(OutDir)/test_cutest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../test/c/cutest,../../test/c/suite,../../test/c/common" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;TEST_HARNESS_C;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_cutest.pch" AssemblerListingLocation="$(OutDir)/test_cutest/" ObjectFile="$(OutDir)/test_cutest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include,../../test/c/cutest,../../test/c/suite,../../test/c/common" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;TEST_HARNESS_C;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_cutest.pch" AssemblerListingLocation="$(OutDir)/test_cutest/" ObjectFile="$(OutDir)/test_cutest/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib ws2_32.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_cutest.exe" ProgramDatabaseFile="$(OutDir)/test_cutest.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -55,6 +55,7 @@ <File RelativePath="..\..\test\c\cutest\CuTest.c"/> <File RelativePath="..\..\test\c\cutest\CuTests.c"/> <File RelativePath="..\..\test\c\cutest\Runner.c"/> + <File RelativePath="..\..\test\c\suites\TestCallbackSetterAndGetter.c"/> <File RelativePath="..\..\test\c\suites\TestChannel.c"/> <File RelativePath="..\..\test\c\suites\TestDbHotBackup.c"/> <File RelativePath="..\..\test\c\suites\TestDbTuner.c"/> @@ -62,7 +63,10 @@ <File RelativePath="..\..\test\c\suites\TestEnvConfig.c"/> <File RelativePath="..\..\test\c\suites\TestEnvMethod.c"/> <File RelativePath="..\..\test\c\suites\TestKeyExistErrorReturn.c"/> + <File RelativePath="..\..\test\c\suites\TestMutexAlignment.c"/> <File RelativePath="..\..\test\c\suites\TestPartial.c"/> + <File RelativePath="..\..\test\c\suites\TestPartition.c"/> + <File RelativePath="..\..\test\c\suites\TestPreOpenSetterAndGetter.c"/> <File RelativePath="..\..\test\c\suites\TestQueue.c"/> </Files> <Globals/> diff --git a/build_windows/VS8/test_micro.vcproj b/build_windows/VS8/test_micro.vcproj index 3cfd2871..c93ae8d6 100644 --- a/build_windows/VS8/test_micro.vcproj +++ b/build_windows/VS8/test_micro.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_micro.pch" AssemblerListingLocation="$(OutDir)/test_micro/" ObjectFile="$(OutDir)/test_micro/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_micro.pch" AssemblerListingLocation="$(OutDir)/test_micro/" ObjectFile="$(OutDir)/test_micro/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_micro.pch" AssemblerListingLocation="$(OutDir)/test_micro/" ObjectFile="$(OutDir)/test_micro/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_micro.pch" AssemblerListingLocation="$(OutDir)/test_micro/" ObjectFile="$(OutDir)/test_micro/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_micro.exe" ProgramDatabaseFile="$(OutDir)/test_micro.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/VS8/test_mutex.vcproj b/build_windows/VS8/test_mutex.vcproj index 9721f58d..5258f7c6 100644 --- a/build_windows/VS8/test_mutex.vcproj +++ b/build_windows/VS8/test_mutex.vcproj @@ -11,7 +11,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_mutex.pch" AssemblerListingLocation="$(OutDir)/test_mutex/" ObjectFile="$(OutDir)/test_mutex/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -22,7 +22,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_mutex.pch" AssemblerListingLocation="$(OutDir)/test_mutex/" ObjectFile="$(OutDir)/test_mutex/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x86" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -33,7 +33,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DIAGNOSTIC;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_mutex.pch" AssemblerListingLocation="$(OutDir)/test_mutex/" ObjectFile="$(OutDir)/test_mutex/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" BasicRuntimeChecks="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61d.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> @@ -44,7 +44,7 @@ <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool Name="VCCLCompilerTool" Optimization="2" MinimalRebuild="TRUE" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../build_windows,../../src,../../src/dbinc,../../include" PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderFile="./$(OutDir)/test_mutex.pch" AssemblerListingLocation="$(OutDir)/test_mutex/" ObjectFile="$(OutDir)/test_mutex/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> - <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb53.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> + <Tool Name="VCLinkerTool" AdditionalOptions="/machine:x64" AdditionalDependencies="libdb61.lib" AdditionalLibraryDirectories="$(OutDir);../../lib" OutputFile="$(OutDir)/test_mutex.exe" ProgramDatabaseFile="$(OutDir)/test_mutex.pdb" LinkIncremental="1" GenerateDebugInformation="TRUE" SuppressStartupBanner="TRUE" OptimizeReferences="2" TargetMachine="0"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCCustomBuildTool"/></Configuration> diff --git a/build_windows/db.h b/build_windows/db.h index 3b9a43a5..a5d36355 100644 --- a/build_windows/db.h +++ b/build_windows/db.h @@ -2,7 +2,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ * @@ -57,13 +57,13 @@ extern "C" { /* * Berkeley DB version information. */ -#define DB_VERSION_FAMILY 11 -#define DB_VERSION_RELEASE 2 -#define DB_VERSION_MAJOR 5 -#define DB_VERSION_MINOR 3 -#define DB_VERSION_PATCH 21 -#define DB_VERSION_STRING "Berkeley DB 5.3.21: (May 11, 2012)" -#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.3.21: (May 11, 2012)" +#define DB_VERSION_FAMILY 12 +#define DB_VERSION_RELEASE 1 +#define DB_VERSION_MAJOR 6 +#define DB_VERSION_MINOR 1 +#define DB_VERSION_PATCH 23 +#define DB_VERSION_STRING "Berkeley DB 6.1.23: (February 17, 2015)" +#define DB_VERSION_FULL_STRING "Berkeley DB 12c Release 1, library version 12.1.6.1.23: (February 17, 2015)" /* * !!! @@ -131,6 +131,7 @@ typedef u_int32_t uintptr_t; */ #define off_t __db_off_t typedef int64_t off_t; +typedef int64_t db_off_t; typedef int32_t pid_t; #ifdef HAVE_MIXED_SIZE_ADDRESSING typedef u_int32_t db_size_t; @@ -162,9 +163,9 @@ typedef u_int16_t db_indx_t; /* Page offset type. */ #define DB_MAX_PAGES 0xffffffff /* >= # of pages in a file */ typedef u_int32_t db_recno_t; /* Record number type. */ -#define DB_MAX_RECORDS 0xffffffff /* >= # of records in a tree */ +#define DB_MAX_RECORDS 0xffffffff /* >= # of records in a recno tree. */ -typedef u_int32_t db_timeout_t; /* Type of a timeout. */ +typedef u_int32_t db_timeout_t; /* Type of a timeout in microseconds. */ /* * Region offsets are the difference between a pointer in a region and the @@ -188,6 +189,10 @@ struct __db_compact; typedef struct __db_compact DB_COMPACT; struct __db_dbt; typedef struct __db_dbt DBT; struct __db_distab; typedef struct __db_distab DB_DISTAB; struct __db_env; typedef struct __db_env DB_ENV; +struct __db_event_mutex_died_info; + typedef struct __db_event_mutex_died_info DB_EVENT_MUTEX_DIED_INFO; +struct __db_event_failchk_info; + typedef struct __db_event_failchk_info DB_EVENT_FAILCHK_INFO; struct __db_h_stat; typedef struct __db_h_stat DB_HASH_STAT; struct __db_heap_rid; typedef struct __db_heap_rid DB_HEAP_RID; struct __db_heap_stat; typedef struct __db_heap_stat DB_HEAP_STAT; @@ -220,6 +225,7 @@ struct __db_repmgr_site;typedef struct __db_repmgr_site DB_REPMGR_SITE; struct __db_repmgr_stat;typedef struct __db_repmgr_stat DB_REPMGR_STAT; struct __db_seq_record; typedef struct __db_seq_record DB_SEQ_RECORD; struct __db_seq_stat; typedef struct __db_seq_stat DB_SEQUENCE_STAT; +struct __db_stream; typedef struct __db_stream DB_STREAM; struct __db_site; typedef struct __db_site DB_SITE; struct __db_sequence; typedef struct __db_sequence DB_SEQUENCE; struct __db_thread_info;typedef struct __db_thread_info DB_THREAD_INFO; @@ -257,18 +263,20 @@ struct __db_dbt { void *app_data; -#define DB_DBT_APPMALLOC 0x001 /* Callback allocated memory. */ -#define DB_DBT_BULK 0x002 /* Internal: Insert if duplicate. */ -#define DB_DBT_DUPOK 0x004 /* Internal: Insert if duplicate. */ -#define DB_DBT_ISSET 0x008 /* Lower level calls set value. */ -#define DB_DBT_MALLOC 0x010 /* Return in malloc'd memory. */ -#define DB_DBT_MULTIPLE 0x020 /* References multiple records. */ -#define DB_DBT_PARTIAL 0x040 /* Partial put/get. */ -#define DB_DBT_REALLOC 0x080 /* Return in realloc'd memory. */ -#define DB_DBT_READONLY 0x100 /* Readonly, don't update. */ -#define DB_DBT_STREAMING 0x200 /* Internal: DBT is being streamed. */ -#define DB_DBT_USERCOPY 0x400 /* Use the user-supplied callback. */ -#define DB_DBT_USERMEM 0x800 /* Return in user's memory. */ +#define DB_DBT_APPMALLOC 0x0001 /* Callback allocated memory. */ +#define DB_DBT_BULK 0x0002 /* Internal: Insert if duplicate. */ +#define DB_DBT_DUPOK 0x0004 /* Internal: Insert if duplicate. */ +#define DB_DBT_ISSET 0x0008 /* Lower level calls set value. */ +#define DB_DBT_MALLOC 0x0010 /* Return in malloc'd memory. */ +#define DB_DBT_MULTIPLE 0x0020 /* References multiple records. */ +#define DB_DBT_PARTIAL 0x0040 /* Partial put/get. */ +#define DB_DBT_REALLOC 0x0080 /* Return in realloc'd memory. */ +#define DB_DBT_READONLY 0x0100 /* Readonly, don't update. */ +#define DB_DBT_STREAMING 0x0200 /* Internal: DBT is being streamed. */ +#define DB_DBT_USERCOPY 0x0400 /* Use the user-supplied callback. */ +#define DB_DBT_USERMEM 0x0800 /* Return in user's memory. */ +#define DB_DBT_BLOB 0x1000 /* Data item is a blob. */ +#define DB_DBT_BLOB_REC 0x2000 /* Internal: Blob database record. */ u_int32_t flags; }; @@ -305,6 +313,23 @@ struct __db_mutex_stat { /* SHARED */ #endif }; +/* Buffers passed to __mutex_describe() must be at least this large. */ +#define DB_MUTEX_DESCRIBE_STRLEN 128 + +/* This is the info of a DB_EVENT_MUTEX_DIED event notification. */ +struct __db_event_mutex_died_info { + pid_t pid; /* Process which last owned the mutex */ + db_threadid_t tid; /* Thread which last owned the mutex */ + db_mutex_t mutex; /* ID of the mutex */ + char desc[DB_MUTEX_DESCRIBE_STRLEN]; +}; + +/* This is the info of a DB_EVENT_FAILCHK event notification. */ +#define DB_FAILURE_SYMPTOM_SIZE 120 +struct __db_event_failchk_info { + int error; + char symptom[DB_FAILURE_SYMPTOM_SIZE]; +}; /* This is the length of the buffer passed to DB_ENV->thread_id_string() */ #define DB_THREADID_STRLEN 128 @@ -431,6 +456,8 @@ struct __db_lock_stat { /* SHARED */ uintmax_t st_lockers_nowait; /* Locker lock granted without wait. */ uintmax_t st_region_wait; /* Region lock granted after wait. */ uintmax_t st_region_nowait; /* Region lock granted without wait. */ + uintmax_t st_nlockers_hit; /* Lockers found in thread info. */ + uintmax_t st_nlockers_reused; /* Lockers reallocated from thread info. */ u_int32_t st_hash_len; /* Max length of bucket. */ roff_t st_regsize; /* Region size. */ #endif @@ -500,7 +527,7 @@ struct __db_lockreq { /******************************************************* * Logging. *******************************************************/ -#define DB_LOGVERSION 19 /* Current log version. */ +#define DB_LOGVERSION 22 /* Current log version. */ #define DB_LOGVERSION_LATCHING 15 /* Log version using latching: db-4.8 */ #define DB_LOGCHKSUM 12 /* Check sum headers: db-4.5 */ #define DB_LOGOLDVER 8 /* Oldest version supported: db-4.2 */ @@ -626,7 +653,8 @@ typedef enum { LOGREC_PGDDBT, LOGREC_PGLIST, LOGREC_POINTER, - LOGREC_TIME + LOGREC_TIME, + LOGREC_LONGARG } log_rec_type_t; typedef const struct __log_rec_spec { @@ -786,6 +814,7 @@ struct __db_mpool_stat { /* SHARED */ uintmax_t st_mvcc_frozen; /* Buffers frozen. */ uintmax_t st_mvcc_thawed; /* Buffers thawed. */ uintmax_t st_mvcc_freed; /* Frozen buffers freed. */ + uintmax_t st_mvcc_reused; /* Outdated invisible buffers reused. */ uintmax_t st_alloc; /* Number of page allocations. */ uintmax_t st_alloc_buckets; /* Buckets checked during allocation. */ uintmax_t st_alloc_max_buckets;/* Max checked during allocation. */ @@ -793,6 +822,8 @@ struct __db_mpool_stat { /* SHARED */ uintmax_t st_alloc_max_pages; /* Max checked during allocation. */ uintmax_t st_io_wait; /* Thread waited on buffer I/O. */ uintmax_t st_sync_interrupted; /* Number of times sync interrupted. */ + u_int32_t st_oddfsize_detect; /* Odd file size detected. */ + u_int32_t st_oddfsize_resolve; /* Odd file size resolved. */ roff_t st_regsize; /* Region size. */ roff_t st_regmax; /* Region max. */ #endif @@ -987,7 +1018,7 @@ struct __db_txn { #define TXN_SNAPSHOT 0x08000 /* Snapshot Isolation. */ #define TXN_SYNC 0x10000 /* Write and sync on prepare/commit. */ #define TXN_WRITE_NOSYNC 0x20000 /* Write only on prepare/commit. */ -#define TXN_BULK 0x40000 /* Enable bulk loading optimization. */ +#define TXN_BULK 0x40000 /* Enable bulk loading optimization. */ u_int32_t flags; }; @@ -1096,30 +1127,34 @@ struct __db_txn_token { /* * Event notification types. (Tcl testing interface currently assumes there are - * no more than 32 of these.) + * no more than 32 of these.). Comments include any relevant event_info types. */ #define DB_EVENT_PANIC 0 -#define DB_EVENT_REG_ALIVE 1 -#define DB_EVENT_REG_PANIC 2 -#define DB_EVENT_REP_CLIENT 3 -#define DB_EVENT_REP_CONNECT_BROKEN 4 -#define DB_EVENT_REP_CONNECT_ESTD 5 -#define DB_EVENT_REP_CONNECT_TRY_FAILED 6 -#define DB_EVENT_REP_DUPMASTER 7 -#define DB_EVENT_REP_ELECTED 8 -#define DB_EVENT_REP_ELECTION_FAILED 9 -#define DB_EVENT_REP_INIT_DONE 10 -#define DB_EVENT_REP_JOIN_FAILURE 11 -#define DB_EVENT_REP_LOCAL_SITE_REMOVED 12 -#define DB_EVENT_REP_MASTER 13 -#define DB_EVENT_REP_MASTER_FAILURE 14 -#define DB_EVENT_REP_NEWMASTER 15 -#define DB_EVENT_REP_PERM_FAILED 16 -#define DB_EVENT_REP_SITE_ADDED 17 -#define DB_EVENT_REP_SITE_REMOVED 18 -#define DB_EVENT_REP_STARTUPDONE 19 -#define DB_EVENT_REP_WOULD_ROLLBACK 20 /* Undocumented; C API only. */ -#define DB_EVENT_WRITE_FAILED 21 +#define DB_EVENT_REG_ALIVE 1 /* int: pid which was in env */ +#define DB_EVENT_REG_PANIC 2 /* int: error causing the panic. */ +#define DB_EVENT_REP_AUTOTAKEOVER_FAILED 3 +#define DB_EVENT_REP_CLIENT 4 +#define DB_EVENT_REP_CONNECT_BROKEN 5 /* DB_REPMGR_CONN_ERR */ +#define DB_EVENT_REP_CONNECT_ESTD 6 /* int: EID of remote site */ +#define DB_EVENT_REP_CONNECT_TRY_FAILED 7 /* DB_REPMGR_CONN_ERR */ +#define DB_EVENT_REP_DUPMASTER 8 +#define DB_EVENT_REP_ELECTED 9 +#define DB_EVENT_REP_ELECTION_FAILED 10 +#define DB_EVENT_REP_INIT_DONE 11 +#define DB_EVENT_REP_INQUEUE_FULL 12 +#define DB_EVENT_REP_JOIN_FAILURE 13 +#define DB_EVENT_REP_LOCAL_SITE_REMOVED 14 +#define DB_EVENT_REP_MASTER 15 +#define DB_EVENT_REP_MASTER_FAILURE 16 +#define DB_EVENT_REP_NEWMASTER 17 /* int: new master's site id */ +#define DB_EVENT_REP_PERM_FAILED 18 +#define DB_EVENT_REP_SITE_ADDED 19 /* int: eid */ +#define DB_EVENT_REP_SITE_REMOVED 20 /* int: eid */ +#define DB_EVENT_REP_STARTUPDONE 21 +#define DB_EVENT_REP_WOULD_ROLLBACK 22 /* Undocumented; C API only. */ +#define DB_EVENT_WRITE_FAILED 23 +#define DB_EVENT_MUTEX_DIED 24 /* DB_EVENT_MUTEX_DIED_INFO */ +#define DB_EVENT_FAILCHK_PANIC 25 /* DB_EVENT_FAILCHK_INFO */ #define DB_EVENT_NO_SUCH_EVENT 0xffffffff /* OOB sentinel value */ /* Replication Manager site status. */ @@ -1133,6 +1168,7 @@ struct __db_repmgr_site { u_int32_t status; #define DB_REPMGR_ISPEER 0x01 +#define DB_REPMGR_ISVIEW 0x02 u_int32_t flags; }; @@ -1148,6 +1184,7 @@ struct __db_rep_stat { /* SHARED */ * circumstances, garbaged). */ u_int32_t st_startup_complete; /* Site completed client sync-up. */ + u_int32_t st_view; /* Site is a view. */ #ifndef __TEST_DB_NO_STATISTICS uintmax_t st_log_queued; /* Log records currently queued.+ */ u_int32_t st_status; /* Current replication status. */ @@ -1225,6 +1262,7 @@ struct __db_rep_stat { /* SHARED */ /* Undocumented statistics only used by the test system. */ #ifdef CONFIG_TEST u_int32_t st_filefail_cleanups; /* # of FILE_FAIL cleanups done. */ + uintmax_t st_log_futuredup; /* Future log records that are dups. */ #endif #endif }; @@ -1235,10 +1273,18 @@ struct __db_repmgr_stat { /* SHARED */ uintmax_t st_msgs_queued; /* # msgs queued for network delay. */ uintmax_t st_msgs_dropped; /* # msgs discarded due to excessive queue length. */ + u_int32_t st_incoming_queue_gbytes; /* Incoming queue size: GB. */ + u_int32_t st_incoming_queue_bytes; /* Incoming queue size: B. */ + uintmax_t st_incoming_msgs_dropped; /* # of msgs discarded due to + incoming queue full. */ uintmax_t st_connection_drop; /* Existing connections dropped. */ uintmax_t st_connect_fail; /* Failed new connection attempts. */ - uintmax_t st_elect_threads; /* # of active election threads. */ - uintmax_t st_max_elect_threads; /* Max concurrent e-threads ever. */ + u_int32_t st_elect_threads; /* # of active election threads. */ + u_int32_t st_max_elect_threads; /* Max concurrent e-threads ever. */ + u_int32_t st_site_participants; /* # of repgroup participant sites. */ + u_int32_t st_site_total; /* # of repgroup total sites. */ + u_int32_t st_site_views; /* # of repgroup view sites. */ + uintmax_t st_takeovers; /* # of automatic listener takeovers. */ }; /* Replication Manager connection error. */ @@ -1269,7 +1315,7 @@ struct __db_sequence { db_mutex_t mtx_seq; /* Mutex if sequence is threaded. */ DB_SEQ_RECORD *seq_rp; /* Pointer to current data. */ DB_SEQ_RECORD seq_record; /* Data from DB_SEQUENCE. */ - int32_t seq_cache_size; /* Number of values cached. */ + u_int32_t seq_cache_size; /* Number of values cached. */ db_seq_t seq_last_value; /* Last value cached. */ db_seq_t seq_prev_value; /* Last value returned. */ DBT seq_key; /* DBT pointing to sequence key. */ @@ -1281,8 +1327,8 @@ struct __db_sequence { /* DB_SEQUENCE PUBLIC HANDLE LIST BEGIN */ int (*close) __P((DB_SEQUENCE *, u_int32_t)); int (*get) __P((DB_SEQUENCE *, - DB_TXN *, int32_t, db_seq_t *, u_int32_t)); - int (*get_cachesize) __P((DB_SEQUENCE *, int32_t *)); + DB_TXN *, u_int32_t, db_seq_t *, u_int32_t)); + int (*get_cachesize) __P((DB_SEQUENCE *, u_int32_t *)); int (*get_db) __P((DB_SEQUENCE *, DB **)); int (*get_flags) __P((DB_SEQUENCE *, u_int32_t *)); int (*get_key) __P((DB_SEQUENCE *, DBT *)); @@ -1292,7 +1338,7 @@ struct __db_sequence { int (*open) __P((DB_SEQUENCE *, DB_TXN *, DBT *, u_int32_t)); int (*remove) __P((DB_SEQUENCE *, DB_TXN *, u_int32_t)); - int (*set_cachesize) __P((DB_SEQUENCE *, int32_t)); + int (*set_cachesize) __P((DB_SEQUENCE *, u_int32_t)); int (*set_flags) __P((DB_SEQUENCE *, u_int32_t)); int (*set_range) __P((DB_SEQUENCE *, db_seq_t, db_seq_t)); int (*stat) __P((DB_SEQUENCE *, @@ -1309,7 +1355,7 @@ struct __db_seq_stat { /* SHARED */ db_seq_t st_last_value; /* Last cached value. */ db_seq_t st_min; /* Minimum value. */ db_seq_t st_max; /* Maximum value. */ - int32_t st_cache_size; /* Cache size. */ + u_int32_t st_cache_size; /* Cache size. */ u_int32_t st_flags; /* Flag value. */ }; @@ -1331,15 +1377,15 @@ typedef enum { #define DB_RENAMEMAGIC 0x030800 /* File has been renamed. */ -#define DB_BTREEVERSION 9 /* Current btree version. */ +#define DB_BTREEVERSION 10 /* Current btree version. */ #define DB_BTREEOLDVER 8 /* Oldest btree version supported. */ #define DB_BTREEMAGIC 0x053162 -#define DB_HASHVERSION 9 /* Current hash version. */ +#define DB_HASHVERSION 10 /* Current hash version. */ #define DB_HASHOLDVER 7 /* Oldest hash version supported. */ #define DB_HASHMAGIC 0x061561 -#define DB_HEAPVERSION 1 /* Current heap version. */ +#define DB_HEAPVERSION 2 /* Current heap version. */ #define DB_HEAPOLDVER 1 /* Oldest heap version supported. */ #define DB_HEAPMAGIC 0x074582 @@ -1408,6 +1454,7 @@ typedef enum { #define DB_LOCK_NOTGRANTED (-30992)/* Lock unavailable. */ #define DB_LOG_BUFFER_FULL (-30991)/* In-memory log buffer full. */ #define DB_LOG_VERIFY_BAD (-30990)/* Log verification failed. */ +#define DB_META_CHKSUM_FAIL (-30968)/* Metadata page checksum failed. */ #define DB_NOSERVER (-30989)/* Server panic return. */ #define DB_NOTFOUND (-30988)/* Key/data pair not found (EOF). */ #define DB_OLD_VERSION (-30987)/* Out-of-date version. */ @@ -1436,6 +1483,8 @@ typedef enum { #define DB_DELETED (-30897)/* Recovery file marked deleted. */ #define DB_EVENT_NOT_HANDLED (-30896)/* Forward event to application. */ #define DB_NEEDSPLIT (-30895)/* Page needs to be split. */ +#define DB_NOINTMP (-30886)/* Sequences not supported in temporary + or in-memory databases. */ #define DB_REP_BULKOVF (-30894)/* Rep bulk buffer overflow. */ #define DB_REP_LOGREADY (-30893)/* Rep log ready for recovery. */ #define DB_REP_NEWMASTER (-30892)/* We have learned of a new master. */ @@ -1446,6 +1495,13 @@ typedef enum { #define DB_TXN_CKP (-30888)/* Encountered ckp record in log. */ #define DB_VERIFY_FATAL (-30887)/* DB->verify cannot proceed. */ +/* + * This exit status indicates that a BDB utility failed because it needed a + * resource which had been held by a process which crashed or otherwise did + * not exit cleanly. + */ +#define DB_EXIT_FAILCHK 3 + /* Database handle. */ struct __db { /******************************************************* @@ -1457,7 +1513,7 @@ struct __db { /* Callbacks. */ int (*db_append_recno) __P((DB *, DBT *, db_recno_t)); void (*db_feedback) __P((DB *, int, int)); - int (*dup_compare) __P((DB *, const DBT *, const DBT *)); + int (*dup_compare) __P((DB *, const DBT *, const DBT *, size_t *)); void *app_private; /* Application-private handle. */ @@ -1481,6 +1537,8 @@ struct __db { u_int32_t adj_fileid; /* File's unique ID for curs. adj. */ + u_int32_t blob_threshold; /* Blob threshold record size. */ + #define DB_LOGFILEID_INVALID -1 FNAME *log_filename; /* File's naming info for logging. */ @@ -1624,6 +1682,12 @@ struct __db { /* Reference to foreign -- set in the secondary. */ DB *s_foreign; + DB *blob_meta_db; /* Databases holding blob metadata. */ + DB_SEQUENCE *blob_seq; /* Sequence of blob ids. */ + char *blob_sub_dir; /* Subdirectory for blob files */ + db_seq_t blob_file_id; /* Id of the file blob directory. */ + db_seq_t blob_sdb_id; /* Id of the subdb blob directory. */ + /* API-private structure: used by DB 1.85, C++, Java, Perl and Tcl */ void *api_internal; @@ -1654,8 +1718,11 @@ struct __db { void *(**)(void *, size_t), void (**)(void *))); int (*get_append_recno) __P((DB *, int (**)(DB *, DBT *, db_recno_t))); int (*get_assoc_flags) __P((DB *, u_int32_t *)); + int (*get_blob_dir) __P((DB *, const char **)); + int (*get_blob_sub_dir) __P((DB *, const char **)); + int (*get_blob_threshold) __P((DB *, u_int32_t *)); int (*get_bt_compare) - __P((DB *, int (**)(DB *, const DBT *, const DBT *))); + __P((DB *, int (**)(DB *, const DBT *, const DBT *, size_t *))); int (*get_bt_compress) __P((DB *, int (**)(DB *, const DBT *, const DBT *, const DBT *, const DBT *, DBT *), @@ -1668,7 +1735,7 @@ struct __db { int (*get_create_dir) __P((DB *, const char **)); int (*get_dbname) __P((DB *, const char **, const char **)); int (*get_dup_compare) - __P((DB *, int (**)(DB *, const DBT *, const DBT *))); + __P((DB *, int (**)(DB *, const DBT *, const DBT *, size_t *))); int (*get_encrypt_flags) __P((DB *, u_int32_t *)); DB_ENV *(*get_env) __P((DB *)); void (*get_errcall) __P((DB *, @@ -1678,7 +1745,7 @@ struct __db { int (*get_feedback) __P((DB *, void (**)(DB *, int, int))); int (*get_flags) __P((DB *, u_int32_t *)); int (*get_h_compare) - __P((DB *, int (**)(DB *, const DBT *, const DBT *))); + __P((DB *, int (**)(DB *, const DBT *, const DBT *, size_t *))); int (*get_h_ffactor) __P((DB *, u_int32_t *)); int (*get_h_hash) __P((DB *, u_int32_t (**)(DB *, const void *, u_int32_t))); @@ -1719,8 +1786,10 @@ struct __db { int (*set_alloc) __P((DB *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *))); int (*set_append_recno) __P((DB *, int (*)(DB *, DBT *, db_recno_t))); + int (*set_blob_dir) __P((DB *, const char *)); + int (*set_blob_threshold) __P((DB *, u_int32_t, u_int32_t)); int (*set_bt_compare) - __P((DB *, int (*)(DB *, const DBT *, const DBT *))); + __P((DB *, int (*)(DB *, const DBT *, const DBT *, size_t *))); int (*set_bt_compress) __P((DB *, int (*)(DB *, const DBT *, const DBT *, const DBT *, const DBT *, DBT *), int (*)(DB *, const DBT *, const DBT *, DBT *, DBT *, DBT *))); @@ -1730,7 +1799,7 @@ struct __db { int (*set_cachesize) __P((DB *, u_int32_t, u_int32_t, int)); int (*set_create_dir) __P((DB *, const char *)); int (*set_dup_compare) - __P((DB *, int (*)(DB *, const DBT *, const DBT *))); + __P((DB *, int (*)(DB *, const DBT *, const DBT *, size_t *))); int (*set_encrypt) __P((DB *, const char *, u_int32_t)); void (*set_errcall) __P((DB *, void (*)(const DB_ENV *, const char *, const char *))); @@ -1739,7 +1808,7 @@ struct __db { int (*set_feedback) __P((DB *, void (*)(DB *, int, int))); int (*set_flags) __P((DB *, u_int32_t)); int (*set_h_compare) - __P((DB *, int (*)(DB *, const DBT *, const DBT *))); + __P((DB *, int (*)(DB *, const DBT *, const DBT *, size_t *))); int (*set_h_ffactor) __P((DB *, u_int32_t)); int (*set_h_hash) __P((DB *, u_int32_t (*)(DB *, const void *, u_int32_t))); @@ -1839,13 +1908,34 @@ struct __db { u_int32_t orig_flags; /* Flags at open, for refresh */ u_int32_t flags; -#define DB2_AM_EXCL 0x00000001 /* Exclusively lock the handle */ -#define DB2_AM_INTEXCL 0x00000002 /* Internal exclusive lock. */ -#define DB2_AM_NOWAIT 0x00000004 /* Do not wait for handle lock */ - u_int32_t orig_flags2; /* Second flags word; for refresh */ +#define DB2_AM_EXCL 0x00000001 /* Exclusively lock the handle */ +#define DB2_AM_INTEXCL 0x00000002 /* Internal exclusive lock. */ +#define DB2_AM_NOWAIT 0x00000004 /* Do not wait for handle lock */ u_int32_t flags2; /* Second flags word */ }; +/* + * Stream interface for blob files. + */ +struct __db_stream { + DBC *dbc; /* Cursor pointing to the db blob record. */ + DB_FH *fhp; + + /* DB_STREAM PUBLIC HANDLE LIST BEGIN */ + int (*close) __P((DB_STREAM *, u_int32_t)); + int (*read) __P((DB_STREAM *, DBT *, db_off_t, u_int32_t, u_int32_t)); + int (*size) __P((DB_STREAM *, db_off_t *, u_int32_t)); + int (*write) __P((DB_STREAM *, DBT *, db_off_t, u_int32_t)); + /* DB_STREAM PUBLIC HANDLE LIST END */ + + u_int32_t flags; +#define DB_STREAM_READ 0x00000001 /* Stream is read only. */ +#define DB_STREAM_WRITE 0x00000002 /* Stream is writeable. */ +#define DB_STREAM_SYNC_WRITE 0x00000004 /* Sync file on each write. */ + db_seq_t blob_id; + db_off_t file_size; +}; + /* * Macros for bulk operations. These are only intended for the C API. * For C++, use DbMultiple*Iterator or DbMultiple*Builder. @@ -1920,7 +2010,7 @@ struct __db { pointer = __p; \ } while (0) -#define DB_MULTIPLE_WRITE_INIT(pointer, dbt) \ +#define DB_MULTIPLE_WRITE_INIT(pointer, dbt) \ do { \ (dbt)->flags |= DB_DBT_BULK; \ pointer = (u_int8_t *)(dbt)->data + \ @@ -1928,7 +2018,7 @@ struct __db { *(u_int32_t *)(pointer) = (u_int32_t)-1; \ } while (0) -#define DB_MULTIPLE_RESERVE_NEXT(pointer, dbt, writedata, writedlen) \ +#define DB_MULTIPLE_RESERVE_NEXT(pointer, dbt, writedata, writedlen) \ do { \ u_int32_t *__p = (u_int32_t *)(pointer); \ u_int32_t __off = ((pointer) == (u_int8_t *)(dbt)->data +\ @@ -1945,7 +2035,7 @@ struct __db { } \ } while (0) -#define DB_MULTIPLE_WRITE_NEXT(pointer, dbt, writedata, writedlen) \ +#define DB_MULTIPLE_WRITE_NEXT(pointer, dbt, writedata, writedlen) \ do { \ void *__destd; \ DB_MULTIPLE_RESERVE_NEXT((pointer), (dbt), \ @@ -1956,7 +2046,7 @@ struct __db { memcpy(__destd, (writedata), (writedlen)); \ } while (0) -#define DB_MULTIPLE_KEY_RESERVE_NEXT(pointer, dbt, writekey, writeklen, writedata, writedlen) \ +#define DB_MULTIPLE_KEY_RESERVE_NEXT(pointer, dbt, writekey, writeklen, writedata, writedlen) \ do { \ u_int32_t *__p = (u_int32_t *)(pointer); \ u_int32_t __off = ((pointer) == (u_int8_t *)(dbt)->data +\ @@ -1979,7 +2069,7 @@ struct __db { } \ } while (0) -#define DB_MULTIPLE_KEY_WRITE_NEXT(pointer, dbt, writekey, writeklen, writedata, writedlen) \ +#define DB_MULTIPLE_KEY_WRITE_NEXT(pointer, dbt, writekey, writeklen, writedata, writedlen) \ do { \ void *__destk, *__destd; \ DB_MULTIPLE_KEY_RESERVE_NEXT((pointer), (dbt), \ @@ -1993,7 +2083,7 @@ struct __db { } \ } while (0) -#define DB_MULTIPLE_RECNO_WRITE_INIT(pointer, dbt) \ +#define DB_MULTIPLE_RECNO_WRITE_INIT(pointer, dbt) \ do { \ (dbt)->flags |= DB_DBT_BULK; \ pointer = (u_int8_t *)(dbt)->data + \ @@ -2001,7 +2091,7 @@ struct __db { *(u_int32_t *)(pointer) = 0; \ } while (0) -#define DB_MULTIPLE_RECNO_RESERVE_NEXT(pointer, dbt, recno, writedata, writedlen) \ +#define DB_MULTIPLE_RECNO_RESERVE_NEXT(pointer, dbt, recno, writedata, writedlen) \ do { \ u_int32_t *__p = (u_int32_t *)(pointer); \ u_int32_t __off = ((pointer) == (u_int8_t *)(dbt)->data +\ @@ -2019,7 +2109,7 @@ struct __db { } \ } while (0) -#define DB_MULTIPLE_RECNO_WRITE_NEXT(pointer, dbt, recno, writedata, writedlen)\ +#define DB_MULTIPLE_RECNO_WRITE_NEXT(pointer, dbt, recno, writedata, writedlen)\ do { \ void *__destd; \ DB_MULTIPLE_RECNO_RESERVE_NEXT((pointer), (dbt), \ @@ -2034,7 +2124,7 @@ struct __db_heap_rid { db_pgno_t pgno; /* Page number. */ db_indx_t indx; /* Index in the offset table. */ }; -#define DB_HEAP_RID_SZ (sizeof(db_pgno_t) + sizeof(db_indx_t)) +#define DB_HEAP_RID_SZ (sizeof(db_pgno_t) + sizeof(db_indx_t)) /******************************************************* * Access method cursors. @@ -2105,6 +2195,7 @@ struct __dbc { int (*close) __P((DBC *)); int (*cmp) __P((DBC *, DBC *, int *, u_int32_t)); int (*count) __P((DBC *, db_recno_t *, u_int32_t)); + int (*db_stream) __P((DBC *, DB_STREAM **, u_int32_t)); int (*del) __P((DBC *, u_int32_t)); int (*dup) __P((DBC *, DBC **, u_int32_t)); int (*get) __P((DBC *, DBT *, DBT *, u_int32_t)); @@ -2182,6 +2273,7 @@ struct __db_bt_stat { /* SHARED */ u_int32_t bt_pagecnt; /* Page count. */ u_int32_t bt_pagesize; /* Page size. */ u_int32_t bt_minkey; /* Minkey value. */ + u_int32_t bt_nblobs; /* Number of blobs. */ u_int32_t bt_re_len; /* Fixed-length record length. */ u_int32_t bt_re_pad; /* Fixed-length record pad. */ u_int32_t bt_levels; /* Tree levels. */ @@ -2210,7 +2302,7 @@ struct __db_compact { u_int32_t compact_deadlock; /* Number of deadlocks. */ db_pgno_t compact_pages_truncated; /* Pages truncated to OS. */ /* Internal. */ - db_pgno_t compact_truncate; /* Page number for truncation */ + db_pgno_t compact_truncate; /* Exchange pages above here. */ }; /* Hash statistics structure. */ @@ -2220,6 +2312,7 @@ struct __db_h_stat { /* SHARED */ u_int32_t hash_metaflags; /* Metadata flags. */ u_int32_t hash_nkeys; /* Number of unique keys. */ u_int32_t hash_ndata; /* Number of data items. */ + u_int32_t hash_nblobs; /* Number of blobs. */ u_int32_t hash_pagecnt; /* Page count. */ u_int32_t hash_pagesize; /* Page size. */ u_int32_t hash_ffactor; /* Fill factor specified at create. */ @@ -2239,6 +2332,7 @@ struct __db_heap_stat { /* SHARED */ u_int32_t heap_magic; /* Magic number. */ u_int32_t heap_version; /* Version number. */ u_int32_t heap_metaflags; /* Metadata flags. */ + u_int32_t heap_nblobs; /* Number of blobs. */ u_int32_t heap_nrecs; /* Number of records. */ u_int32_t heap_pagecnt; /* Page count. */ u_int32_t heap_pagesize; /* Page size. */ @@ -2298,21 +2392,15 @@ typedef enum { * Backup configuration types. */ typedef enum { - DB_BACKUP_READ_COUNT = 1, - DB_BACKUP_READ_SLEEP = 2, - DB_BACKUP_SIZE = 3, - DB_BACKUP_WRITE_DIRECT = 4 + DB_BACKUP_READ_COUNT=1, + DB_BACKUP_READ_SLEEP=2, + DB_BACKUP_SIZE=3, + DB_BACKUP_WRITE_DIRECT=4 } DB_BACKUP_CONFIG; struct __db_env { ENV *env; /* Linked ENV structure */ - /* - * The DB_ENV structure can be used concurrently, so field access is - * protected. - */ - db_mutex_t mtx_db_env; /* DB_ENV structure mutex */ - /* Error message callback */ void (*db_errcall) __P((const DB_ENV *, const char *, const char *)); FILE *db_errfile; /* Error message file stream */ @@ -2335,6 +2423,7 @@ struct __db_env { char *(*thread_id_string) __P((DB_ENV *, pid_t, db_threadid_t, char *)); /* Application specified paths */ + char *db_blob_dir; /* Blob file directory */ char *db_log_dir; /* Database log file directory */ char *db_md_dir; /* Persistent metadata directory */ char *db_tmp_dir; /* Database tmp file directory */ @@ -2358,6 +2447,8 @@ struct __db_env { u_int32_t verbose; /* DB_VERB_XXX flags */ + u_int32_t blob_threshold; /* Blob threshold record size */ + /* Mutex configuration */ u_int32_t mutex_align; /* Mutex alignment */ u_int32_t mutex_cnt; /* Number of mutexes to configure */ @@ -2426,6 +2517,11 @@ struct __db_env { * build settings. */ db_timeout_t envreg_timeout; /* DB_REGISTER wait timeout */ + /* + * When failchk broadcasting is active, any wait for a mutex will wake + * up this frequently in order to check whether the mutex has died. + */ + db_timeout_t mutex_failchk_timeout; #define DB_ENV_AUTO_COMMIT 0x00000001 /* DB_AUTO_COMMIT */ #define DB_ENV_CDB_ALLDB 0x00000002 /* CDB environment wide locking */ @@ -2445,8 +2541,8 @@ struct __db_env { #define DB_ENV_TXN_SNAPSHOT 0x00008000 /* DB_TXN_SNAPSHOT set */ #define DB_ENV_TXN_WRITE_NOSYNC 0x00010000 /* DB_TXN_WRITE_NOSYNC set */ #define DB_ENV_YIELDCPU 0x00020000 /* DB_YIELDCPU set */ -#define DB_ENV_HOTBACKUP 0x00040000 /* DB_HOTBACKUP_IN_PROGRESS set */ -#define DB_ENV_NOFLUSH 0x00080000 /* DB_NOFLUSH set */ +#define DB_ENV_HOTBACKUP 0x00040000 /* DB_HOTBACKUP_IN_PROGRESS set */ +#define DB_ENV_NOFLUSH 0x00080000 /* DB_NOFLUSH set */ u_int32_t flags; /* DB_ENV PUBLIC HANDLE LIST BEGIN */ @@ -2467,6 +2563,8 @@ struct __db_env { void *(**)(void *, size_t), void (**)(void *))); int (*get_app_dispatch) __P((DB_ENV *, int (**)(DB_ENV *, DBT *, DB_LSN *, db_recops))); + int (*get_blob_dir) __P((DB_ENV *, const char **)); + int (*get_blob_threshold) __P((DB_ENV*, u_int32_t *)); int (*get_cache_max) __P((DB_ENV *, u_int32_t *, u_int32_t *)); int (*get_cachesize) __P((DB_ENV *, u_int32_t *, u_int32_t *, int *)); int (*get_create_dir) __P((DB_ENV *, const char **)); @@ -2482,8 +2580,8 @@ struct __db_env { void (**)(const DB_ENV *, const char *, const char *))); void (*get_errfile) __P((DB_ENV *, FILE **)); void (*get_errpfx) __P((DB_ENV *, const char **)); - int (*get_flags) __P((DB_ENV *, u_int32_t *)); int (*get_feedback) __P((DB_ENV *, void (**)(DB_ENV *, int, int))); + int (*get_flags) __P((DB_ENV *, u_int32_t *)); int (*get_home) __P((DB_ENV *, const char **)); int (*get_intermediate_dir_mode) __P((DB_ENV *, const char **)); int (*get_isalive) __P((DB_ENV *, @@ -2599,17 +2697,23 @@ struct __db_env { int (*rep_set_timeout) __P((DB_ENV *, int, db_timeout_t)); int (*rep_set_transport) __P((DB_ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t))); + int (*rep_set_view) __P((DB_ENV *, int (*)(DB_ENV *, + const char *, int *, u_int32_t))); int (*rep_start) __P((DB_ENV *, DBT *, u_int32_t)); int (*rep_stat) __P((DB_ENV *, DB_REP_STAT **, u_int32_t)); int (*rep_stat_print) __P((DB_ENV *, u_int32_t)); int (*rep_sync) __P((DB_ENV *, u_int32_t)); int (*repmgr_channel) __P((DB_ENV *, int, DB_CHANNEL **, u_int32_t)); int (*repmgr_get_ack_policy) __P((DB_ENV *, int *)); + int (*repmgr_get_incoming_queue_max) + __P((DB_ENV *, u_int32_t *, u_int32_t *)); int (*repmgr_local_site) __P((DB_ENV *, DB_SITE **)); int (*repmgr_msg_dispatch) __P((DB_ENV *, void (*)(DB_ENV *, DB_CHANNEL *, DBT *, u_int32_t, u_int32_t), u_int32_t)); int (*repmgr_set_ack_policy) __P((DB_ENV *, int)); + int (*repmgr_set_incoming_queue_max) + __P((DB_ENV *, u_int32_t, u_int32_t)); int (*repmgr_site) __P((DB_ENV *, const char *, u_int, DB_SITE**, u_int32_t)); int (*repmgr_site_by_eid) __P((DB_ENV *, int, DB_SITE**)); @@ -2621,6 +2725,8 @@ struct __db_env { void *(*)(void *, size_t), void (*)(void *))); int (*set_app_dispatch) __P((DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops))); + int (*set_blob_dir) __P((DB_ENV *, const char *)); + int (*set_blob_threshold) __P((DB_ENV *, u_int32_t, u_int32_t)); int (*set_cache_max) __P((DB_ENV *, u_int32_t, u_int32_t)); int (*set_cachesize) __P((DB_ENV *, u_int32_t, u_int32_t, int)); int (*set_create_dir) __P((DB_ENV *, const char *)); @@ -2693,8 +2799,8 @@ struct __db_env { /* DB_ENV PUBLIC HANDLE LIST END */ /* DB_ENV PRIVATE HANDLE LIST BEGIN */ - int (*prdbt) __P((DBT *, int, - const char *, void *, int (*)(void *, const void *), int, int)); + int (*prdbt) __P((DBT *, int, const char *, void *, + int (*)(void *, const void *), int, int, int)); /* DB_ENV PRIVATE HANDLE LIST END */ }; @@ -2880,6 +2986,7 @@ typedef struct entry { #define DB_FLUSH 0x00000002 #define DB_FORCE 0x00000001 #define DB_FORCESYNC 0x00000001 +#define DB_FORCESYNCENV 0x00000002 #define DB_FOREIGN_ABORT 0x00000001 #define DB_FOREIGN_CASCADE 0x00000002 #define DB_FOREIGN_NULLIFY 0x00000004 @@ -2897,8 +3004,9 @@ typedef struct entry { #define DB_INIT_REP 0x00001000 #define DB_INIT_TXN 0x00002000 #define DB_INORDER 0x00000020 -#define DB_INTERNAL_PERSISTENT_DB 0x00001000 -#define DB_INTERNAL_TEMPORARY_DB 0x00002000 +#define DB_INTERNAL_BLOB_DB 0x00001000 +#define DB_INTERNAL_PERSISTENT_DB 0x00002000 +#define DB_INTERNAL_TEMPORARY_DB 0x00004000 #define DB_JOIN_NOSORT 0x00000001 #define DB_LEGACY 0x00000004 #define DB_LOCAL_SITE 0x00000008 @@ -2911,12 +3019,14 @@ typedef struct entry { #define DB_LOCK_SWITCH 0x00000020 #define DB_LOCK_UPGRADE 0x00000040 #define DB_LOG_AUTO_REMOVE 0x00000001 +#define DB_LOG_BLOB 0x00000002 #define DB_LOG_CHKPNT 0x00000001 #define DB_LOG_COMMIT 0x00000004 -#define DB_LOG_DIRECT 0x00000002 -#define DB_LOG_DSYNC 0x00000004 -#define DB_LOG_IN_MEMORY 0x00000008 +#define DB_LOG_DIRECT 0x00000004 +#define DB_LOG_DSYNC 0x00000008 +#define DB_LOG_IN_MEMORY 0x00000010 #define DB_LOG_NOCOPY 0x00000008 +#define DB_LOG_NOSYNC 0x00000020 #define DB_LOG_NOT_DURABLE 0x00000010 #define DB_LOG_NO_DATA 0x00000002 #define DB_LOG_VERIFY_CAF 0x00000001 @@ -2928,7 +3038,7 @@ typedef struct entry { #define DB_LOG_VERIFY_VERBOSE 0x00000040 #define DB_LOG_VERIFY_WARNING 0x00000080 #define DB_LOG_WRNOSYNC 0x00000020 -#define DB_LOG_ZERO 0x00000010 +#define DB_LOG_ZERO 0x00000040 #define DB_MPOOL_CREATE 0x00000001 #define DB_MPOOL_DIRTY 0x00000002 #define DB_MPOOL_DISCARD 0x00000001 @@ -2946,17 +3056,18 @@ typedef struct entry { #define DB_MUTEX_ALLOCATED 0x00000001 #define DB_MUTEX_LOCKED 0x00000002 #define DB_MUTEX_LOGICAL_LOCK 0x00000004 +#define DB_MUTEX_OWNER_DEAD 0x00000020 #define DB_MUTEX_PROCESS_ONLY 0x00000008 #define DB_MUTEX_SELF_BLOCK 0x00000010 -#define DB_MUTEX_SHARED 0x00000020 -#define DB_NOERROR 0x00004000 +#define DB_MUTEX_SHARED 0x00000040 +#define DB_NOERROR 0x00008000 #define DB_NOFLUSH 0x00001000 #define DB_NOLOCKING 0x00002000 #define DB_NOMMAP 0x00000010 #define DB_NOORDERCHK 0x00000002 #define DB_NOPANIC 0x00004000 #define DB_NOSYNC 0x00000001 -#define DB_NO_AUTO_COMMIT 0x00008000 +#define DB_NO_AUTO_COMMIT 0x00010000 #define DB_NO_CHECKPOINT 0x00008000 #define DB_ODDFILESIZE 0x00000080 #define DB_ORDERCHKONLY 0x00000004 @@ -2967,7 +3078,7 @@ typedef struct entry { #define DB_PR_PAGE 0x00000010 #define DB_PR_RECOVERYTEST 0x00000020 #define DB_RDONLY 0x00000400 -#define DB_RDWRMASTER 0x00010000 +#define DB_RDWRMASTER 0x00020000 #define DB_READ_COMMITTED 0x00000400 #define DB_READ_UNCOMMITTED 0x00000200 #define DB_RECNUM 0x00000040 @@ -2978,17 +3089,20 @@ typedef struct entry { #define DB_RENUMBER 0x00000080 #define DB_REPMGR_CONF_2SITE_STRICT 0x00000001 #define DB_REPMGR_CONF_ELECTIONS 0x00000002 +#define DB_REPMGR_CONF_PREFMAS_CLIENT 0x00000004 +#define DB_REPMGR_CONF_PREFMAS_MASTER 0x00000008 #define DB_REPMGR_NEED_RESPONSE 0x00000001 #define DB_REPMGR_PEER 0x00000010 #define DB_REP_ANYWHERE 0x00000001 #define DB_REP_CLIENT 0x00000001 -#define DB_REP_CONF_AUTOINIT 0x00000004 -#define DB_REP_CONF_AUTOROLLBACK 0x00000008 -#define DB_REP_CONF_BULK 0x00000010 -#define DB_REP_CONF_DELAYCLIENT 0x00000020 -#define DB_REP_CONF_INMEM 0x00000040 -#define DB_REP_CONF_LEASE 0x00000080 -#define DB_REP_CONF_NOWAIT 0x00000100 +#define DB_REP_CONF_AUTOINIT 0x00000010 +#define DB_REP_CONF_AUTOROLLBACK 0x00000020 +#define DB_REP_CONF_BULK 0x00000040 +#define DB_REP_CONF_DELAYCLIENT 0x00000080 +#define DB_REP_CONF_ELECT_LOGLENGTH 0x00000100 +#define DB_REP_CONF_INMEM 0x00000200 +#define DB_REP_CONF_LEASE 0x00000400 +#define DB_REP_CONF_NOWAIT 0x00000800 #define DB_REP_ELECTION 0x00000004 #define DB_REP_MASTER 0x00000002 #define DB_REP_NOBUFFER 0x00000002 @@ -3005,8 +3119,9 @@ typedef struct entry { #define DB_SEQ_WRAP 0x00000008 #define DB_SEQ_WRAPPED 0x00000010 #define DB_SET_LOCK_TIMEOUT 0x00000001 -#define DB_SET_REG_TIMEOUT 0x00000004 -#define DB_SET_TXN_NOW 0x00000008 +#define DB_SET_MUTEX_FAILCHK_TIMEOUT 0x00000004 +#define DB_SET_REG_TIMEOUT 0x00000008 +#define DB_SET_TXN_NOW 0x00000010 #define DB_SET_TXN_TIMEOUT 0x00000002 #define DB_SHALLOW_DUP 0x00000100 #define DB_SNAPSHOT 0x00000200 @@ -3032,7 +3147,7 @@ typedef struct entry { #define DB_SYSTEM_MEM 0x00080000 #define DB_THREAD 0x00000020 #define DB_TIME_NOTGRANTED 0x00040000 -#define DB_TRUNCATE 0x00020000 +#define DB_TRUNCATE 0x00040000 #define DB_TXN_BULK 0x00000010 #define DB_TXN_FAMILY 0x00000040 #define DB_TXN_NOSYNC 0x00000001 @@ -3050,24 +3165,25 @@ typedef struct entry { #define DB_VERB_DEADLOCK 0x00000002 #define DB_VERB_FILEOPS 0x00000004 #define DB_VERB_FILEOPS_ALL 0x00000008 -#define DB_VERB_RECOVERY 0x00000010 -#define DB_VERB_REGISTER 0x00000020 -#define DB_VERB_REPLICATION 0x00000040 -#define DB_VERB_REPMGR_CONNFAIL 0x00000080 -#define DB_VERB_REPMGR_MISC 0x00000100 -#define DB_VERB_REP_ELECT 0x00000200 -#define DB_VERB_REP_LEASE 0x00000400 -#define DB_VERB_REP_MISC 0x00000800 -#define DB_VERB_REP_MSGS 0x00001000 -#define DB_VERB_REP_SYNC 0x00002000 -#define DB_VERB_REP_SYSTEM 0x00004000 -#define DB_VERB_REP_TEST 0x00008000 -#define DB_VERB_WAITSFOR 0x00010000 +#define DB_VERB_MVCC 0x00000010 +#define DB_VERB_RECOVERY 0x00000020 +#define DB_VERB_REGISTER 0x00000040 +#define DB_VERB_REPLICATION 0x00000080 +#define DB_VERB_REPMGR_CONNFAIL 0x00000100 +#define DB_VERB_REPMGR_MISC 0x00000200 +#define DB_VERB_REP_ELECT 0x00000400 +#define DB_VERB_REP_LEASE 0x00000800 +#define DB_VERB_REP_MISC 0x00001000 +#define DB_VERB_REP_MSGS 0x00002000 +#define DB_VERB_REP_SYNC 0x00004000 +#define DB_VERB_REP_SYSTEM 0x00008000 +#define DB_VERB_REP_TEST 0x00010000 +#define DB_VERB_WAITSFOR 0x00020000 #define DB_VERIFY 0x00000002 #define DB_VERIFY_PARTITION 0x00040000 #define DB_WRITECURSOR 0x00000010 #define DB_WRITELOCK 0x00000020 -#define DB_WRITEOPEN 0x00040000 +#define DB_WRITEOPEN 0x00080000 #define DB_XA_CREATE 0x00000001 #define DB_YIELDCPU 0x00080000 diff --git a/build_windows/db_config.h b/build_windows/db_config.h index d06f8b1a..72c0d72d 100644 --- a/build_windows/db_config.h +++ b/build_windows/db_config.h @@ -90,6 +90,17 @@ /* Define to 1 if building the DBM API. */ #define HAVE_DBM 1 +/* Define to 1 if you want a version that records extra information about + errors. */ +/* #undef HAVE_ERROR_HISTORY */ + +/* Define to 1 if you have the `directio' function. */ +/* #undef HAVE_DIRECTIO */ + +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + /* Define to 1 if you have the `directio' function. */ /* #undef HAVE_DIRECTIO */ @@ -109,6 +120,9 @@ /* Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines. */ #define HAVE_EXIT_SUCCESS 1 +/* Define to 1 for failchk to inform all waiting threads about crashes. */ +/* #undef HAVE_FAILCHK_BROADCAST */ + /* Define to 1 if you have the `fchmod' function. */ /* #undef HAVE_FCHMOD */ @@ -186,6 +200,9 @@ /* Define to 1 if you have the `hstrerror' function. */ /* #undef HAVE_HSTRERROR */ +/* Define to 1 if you have the `initstate_r' function. */ +/* #undef HAVE_INITSTATE_R */ + /* Define to 1 if you have the <inttypes.h> header file. */ /* #undef HAVE_INTTYPES_H */ @@ -204,6 +221,9 @@ /* Define to 1 if you have the `localtime' function. */ #define HAVE_LOCALTIME 1 +/* Define to 1 if you have the `localtime_r' function. */ +/* #undef HAVE_LOCALTIME_R */ + /* Define to 1 to enable log checksums. */ #define HAVE_LOG_CHECKSUM 1 @@ -380,6 +400,15 @@ pthread_cond_t. */ /* #undef HAVE_PTHREAD_COND_REINIT_OKAY */ +/* Define to 1 if you have the `pthread_getspecific' function. */ +/* #undef HAVE_PTHREAD_GETSPECIFIC */ + +/* Define to 1 if you have the `pthread_key_create' function. */ +/* #undef HAVE_PTHREAD_KEY_CREATE */ + +/* Define to 1 if you have the `pthread_once' function. */ +/* #undef HAVE_PTHREAD_ONCE */ + /* Define to 1 if it is OK to initialize an already initialized pthread_rwlock_t. */ /* #undef HAVE_PTHREAD_RWLOCK_REINIT_OKAY */ @@ -387,6 +416,9 @@ /* Define to 1 if you have the `pthread_self' function. */ /* #undef HAVE_PTHREAD_SELF */ +/* Define to 1 if you have the `pthread_setspecific' function. */ +/* #undef HAVE_PTHREAD_SETSPECIFIC */ + /* Define to 1 if you have the `pthread_yield' function. */ /* #undef HAVE_PTHREAD_YIELD */ @@ -413,6 +445,9 @@ /* Define to 1 if you have the `random' function. */ /* #undef HAVE_RANDOM */ +/* Define to 1 if you have the `random_r' function. */ +/* #undef HAVE_RANDOM_R / + /* Define to 1 if building replication support. */ #ifndef HAVE_SMALLBUILD #define HAVE_REPLICATION 1 @@ -453,6 +488,9 @@ /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `srandom_r' function. */ +/* #undef HAVE_SRANDOM_R */ + /* Define to 1 if you have the `stat' function. */ #define HAVE_STAT 1 @@ -586,16 +624,16 @@ #define PACKAGE_NAME "Berkeley DB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Berkeley DB 5.3.21" +#define PACKAGE_STRING "Berkeley DB 6.1.23" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-5.3.21" +#define PACKAGE_TARNAME "db-6.1.23" /* Define to the home page for this package. */ #define PACKAGE_URL "http://www.oracle.com/technology/software/products/berkeley-db/index.html" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.3.21" +#define PACKAGE_VERSION "6.1.23" /* The size of a `char', as computed by sizeof. */ /* #undef SIZEOF_CHAR */ @@ -616,6 +654,9 @@ /* The size of a `long long', as computed by sizeof. */ /* #undef SIZEOF_LONG_LONG */ +/* The size of `off_t', as computed by sizeof. */ +/* #undef SIZEOF_OFF_T */ + /* The size of a `short', as computed by sizeof. */ /* #undef SIZEOF_SHORT */ diff --git a/build_windows/db_cxx.h b/build_windows/db_cxx.h index 4bd2e604..0ab3007a 100644 --- a/build_windows/db_cxx.h +++ b/build_windows/db_cxx.h @@ -2,7 +2,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -77,6 +77,7 @@ class DbMpoolFile; // forward class DbPreplist; // forward class DbSequence; // forward class DbSite; // forward +class DbStream; // forward class Dbt; // forward class DbTxn; // forward @@ -160,13 +161,13 @@ extern "C" { typedef void (*db_free_fcn_type) (void *); typedef int (*bt_compare_fcn_type) /*C++ version available*/ - (DB *, const DBT *, const DBT *); + (DB *, const DBT *, const DBT *, size_t *); typedef size_t (*bt_prefix_fcn_type) /*C++ version available*/ (DB *, const DBT *, const DBT *); typedef int (*dup_compare_fcn_type) /*C++ version available*/ - (DB *, const DBT *, const DBT *); + (DB *, const DBT *, const DBT *, size_t *); typedef int (*h_compare_fcn_type) /*C++ version available*/ - (DB *, const DBT *, const DBT *); + (DB *, const DBT *, const DBT *, size_t *); typedef u_int32_t (*h_hash_fcn_type) /*C++ version available*/ (DB *, const void *, u_int32_t); typedef int (*pgin_fcn_type) @@ -205,7 +206,10 @@ public: virtual int get_alloc( db_malloc_fcn_type *, db_realloc_fcn_type *, db_free_fcn_type *); virtual int get_append_recno(int (**)(Db *, Dbt *, db_recno_t)); - virtual int get_bt_compare(int (**)(Db *, const Dbt *, const Dbt *)); + virtual int get_blob_dir(const char **); + virtual int get_blob_threshold(u_int32_t *); + virtual int get_bt_compare( + int (**)(Db *, const Dbt *, const Dbt *, size_t *)); virtual int get_bt_compress( int (**)( Db *, const Dbt *, const Dbt *, const Dbt *, const Dbt *, Dbt *), @@ -216,7 +220,8 @@ public: virtual int get_cachesize(u_int32_t *, u_int32_t *, int *); virtual int get_create_dir(const char **); virtual int get_dbname(const char **, const char **); - virtual int get_dup_compare(int (**)(Db *, const Dbt *, const Dbt *)); + virtual int get_dup_compare( + int (**)(Db *, const Dbt *, const Dbt *, size_t *)); virtual int get_encrypt_flags(u_int32_t *); virtual void get_errcall( void (**)(const DbEnv *, const char *, const char *)); @@ -226,7 +231,8 @@ public: virtual int get_flags(u_int32_t *); virtual int get_heapsize(u_int32_t *, u_int32_t *); virtual int get_heap_regionsize(u_int32_t *); - virtual int get_h_compare(int (**)(Db *, const Dbt *, const Dbt *)); + virtual int get_h_compare( + int (**)(Db *, const Dbt *, const Dbt *, size_t *)); virtual int get_h_ffactor(u_int32_t *); virtual int get_h_hash(u_int32_t (**)(Db *, const void *, u_int32_t)); virtual int get_h_nelem(u_int32_t *); @@ -262,8 +268,11 @@ public: db_malloc_fcn_type, db_realloc_fcn_type, db_free_fcn_type); virtual void set_app_private(void *); virtual int set_append_recno(int (*)(Db *, Dbt *, db_recno_t)); + virtual int set_blob_dir(const char *); + virtual int set_blob_threshold(u_int32_t, u_int32_t); virtual int set_bt_compare(bt_compare_fcn_type); /*deprecated*/ - virtual int set_bt_compare(int (*)(Db *, const Dbt *, const Dbt *)); + virtual int set_bt_compare( + int (*)(Db *, const Dbt *, const Dbt *, size_t *)); virtual int set_bt_compress( int (*) (Db *, const Dbt *, const Dbt *, const Dbt *, const Dbt *, Dbt *), @@ -274,7 +283,8 @@ public: virtual int set_cachesize(u_int32_t, u_int32_t, int); virtual int set_create_dir(const char *); virtual int set_dup_compare(dup_compare_fcn_type); /*deprecated*/ - virtual int set_dup_compare(int (*)(Db *, const Dbt *, const Dbt *)); + virtual int set_dup_compare( + int (*)(Db *, const Dbt *, const Dbt *, size_t *)); virtual int set_encrypt(const char *, u_int32_t); virtual void set_errcall( void (*)(const DbEnv *, const char *, const char *)); @@ -285,7 +295,8 @@ public: virtual int set_heapsize(u_int32_t, u_int32_t); virtual int set_heap_regionsize(u_int32_t); virtual int set_h_compare(h_compare_fcn_type); /*deprecated*/ - virtual int set_h_compare(int (*)(Db *, const Dbt *, const Dbt *)); + virtual int set_h_compare( + int (*)(Db *, const Dbt *, const Dbt *, size_t *)); virtual int set_h_ffactor(u_int32_t); virtual int set_h_hash(h_hash_fcn_type); /*deprecated*/ virtual int set_h_hash(u_int32_t (*)(Db *, const void *, u_int32_t)); @@ -384,16 +395,16 @@ public: int (*associate_callback_)(Db *, const Dbt *, const Dbt *, Dbt *); int (*associate_foreign_callback_) (Db *, const Dbt *, Dbt *, const Dbt *, int *); - int (*bt_compare_callback_)(Db *, const Dbt *, const Dbt *); + int (*bt_compare_callback_)(Db *, const Dbt *, const Dbt *, size_t *); int (*bt_compress_callback_)( Db *, const Dbt *, const Dbt *, const Dbt *, const Dbt *, Dbt *); int (*bt_decompress_callback_)( Db *, const Dbt *, const Dbt *, Dbt *, Dbt *, Dbt *); size_t (*bt_prefix_callback_)(Db *, const Dbt *, const Dbt *); u_int32_t (*db_partition_callback_)(Db *, Dbt *); - int (*dup_compare_callback_)(Db *, const Dbt *, const Dbt *); + int (*dup_compare_callback_)(Db *, const Dbt *, const Dbt *, size_t *); void (*feedback_callback_)(Db *, int, int); - int (*h_compare_callback_)(Db *, const Dbt *, const Dbt *); + int (*h_compare_callback_)(Db *, const Dbt *, const Dbt *, size_t *); u_int32_t (*h_hash_callback_)(Db *, const void *, u_int32_t); }; @@ -408,6 +419,7 @@ public: int close(); int cmp(Dbc *other_csr, int *result, u_int32_t flags); int count(db_recno_t *countp, u_int32_t flags); + int db_stream(DbStream **dbsp, u_int32_t flags); int del(u_int32_t flags); int dup(Dbc** cursorp, u_int32_t flags); int get(Dbt* key, Dbt *data, u_int32_t flags); @@ -528,6 +540,10 @@ public: int (*)(DbEnv *, const char *, void *)); virtual int get_backup_config(DB_BACKUP_CONFIG, u_int32_t *); virtual int set_backup_config(DB_BACKUP_CONFIG, u_int32_t); + virtual int get_blob_dir(const char **); + virtual int set_blob_dir(const char *); + virtual int get_blob_threshold(u_int32_t *); + virtual int set_blob_threshold(u_int32_t, u_int32_t); virtual int get_cachesize(u_int32_t *, u_int32_t *, int *); virtual int set_cachesize(u_int32_t, u_int32_t, int); virtual int get_cache_max(u_int32_t *, u_int32_t *); @@ -762,10 +778,16 @@ public: virtual int rep_set_priority(u_int32_t priority); virtual int rep_get_timeout(int which, db_timeout_t *timeout); virtual int rep_set_timeout(int which, db_timeout_t timeout); + virtual int rep_set_view(int (*)(DbEnv *, + const char *, int *, u_int32_t)); virtual int repmgr_channel(int eid, DbChannel **channel, u_int32_t flags); virtual int repmgr_get_ack_policy(int *policy); virtual int repmgr_set_ack_policy(int policy); + virtual int repmgr_get_incoming_queue_max(u_int32_t *gbytesp, + u_int32_t *bytesp); + virtual int repmgr_set_incoming_queue_max(u_int32_t gbytes, + u_int32_t bytes); virtual int repmgr_local_site(DbSite **site); virtual int repmgr_msg_dispatch(void (*) (DbEnv *, DbChannel *, Dbt *, u_int32_t, u_int32_t), u_int32_t flags); @@ -825,6 +847,8 @@ public: static int _backup_write_intercept(DB_ENV *dbenv, u_int32_t off_gbytes, u_int32_t off_bytes, u_int32_t size, u_int8_t *buf, void *handle); static void _paniccall_intercept(DB_ENV *dbenv, int errval); + static int _partial_rep_intercept(DB_ENV *dbenv, + const char *name, int *result, u_int32_t flags); static void _feedback_intercept(DB_ENV *dbenv, int opcode, int pct); static void _event_func_intercept(DB_ENV *dbenv, u_int32_t, void *); static int _isalive_intercept(DB_ENV *dbenv, pid_t pid, @@ -873,6 +897,7 @@ private: void (*feedback_callback_)(DbEnv *, int, int); void (*message_callback_)(const DbEnv *, const char *); void (*paniccall_callback_)(DbEnv *, int); + int (*partial_rep_callback_)(DbEnv *, const char *, int *, u_int32_t); void (*event_func_callback_)(DbEnv *, u_int32_t, void *); int (*rep_send_callback_)(DbEnv *, const Dbt *, const Dbt *, const DbLsn *, int, u_int32_t); @@ -1058,9 +1083,9 @@ public: int stat(DB_SEQUENCE_STAT **sp, u_int32_t flags); int stat_print(u_int32_t flags); - int get(DbTxn *txnid, int32_t delta, db_seq_t *retp, u_int32_t flags); - int get_cachesize(int32_t *sizep); - int set_cachesize(int32_t size); + int get(DbTxn *txnid, u_int32_t delta, db_seq_t *retp, u_int32_t flags); + int get_cachesize(u_int32_t *sizep); + int set_cachesize(u_int32_t size); int get_flags(u_int32_t *flagsp); int set_flags(u_int32_t flags); int get_range(db_seq_t *minp, db_seq_t *maxp); @@ -1138,6 +1163,34 @@ private: }; // +// DbStream +// +class _exported DbStream : protected DB_STREAM +{ + friend class Dbc; + +public: + int close(u_int32_t flags); + int read(Dbt *data, db_off_t offset, u_int32_t size, u_int32_t flags); + int size(db_off_t *size, u_int32_t flags); + int write(Dbt *data, db_off_t offset, u_int32_t flags); + +private: + // No data is permitted in this class (see comment at top) + + // Note: use Dbc::dbstream() to get pointers to a DbStream, + // and call Dbstream::close() rather than delete to release them. + // + DbStream(); + ~DbStream(); + + // no copying + DbStream(const DbStream &); + DbStream &operator = (const DbStream &); + +}; + +// // Transaction // class _exported DbTxn @@ -1246,6 +1299,7 @@ class _exported Dbt : private DBT friend class DbEnv; friend class DbLogc; friend class DbSequence; + friend class DbStream; public: // key/data diff --git a/build_windows/db_int.h b/build_windows/db_int.h index 88333d60..2849b9ef 100644 --- a/build_windows/db_int.h +++ b/build_windows/db_int.h @@ -2,7 +2,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -74,6 +74,17 @@ #endif /* !HAVE_SYSTEM_INCLUDE_FILES */ +/* + * The Windows compiler needs to be told about structures that are available + * outside a dll. + */ +#if defined(DB_WIN32) && defined(_MSC_VER) && \ + !defined(DB_CREATE_DLL) && !defined(_LIB) +#define __DB_IMPORT __declspec(dllimport) +#else +#define __DB_IMPORT +#endif + #ifdef DB_WIN32 #include "dbinc/win_db.h" #endif @@ -89,22 +100,12 @@ #include "dbinc/queue.h" #include "dbinc/shqueue.h" #include "dbinc/perfmon.h" +#include "dbinc/clock.h" #if defined(__cplusplus) extern "C" { #endif -/* - * The Windows compiler needs to be told about structures that are available - * outside a dll. - */ -#if defined(DB_WIN32) && defined(_MSC_VER) && \ - !defined(DB_CREATE_DLL) && !defined(_LIB) -#define __DB_IMPORT __declspec(dllimport) -#else -#define __DB_IMPORT -#endif - /******************************************************* * Forward structure declarations. *******************************************************/ @@ -367,22 +368,27 @@ typedef struct __fn { /* * Structure used for callback message aggregation. * - * Display values in XXX_stat_print calls. + * DB_MSGBUF_FLUSH displays values in XXX_stat_print calls. + * DB_MSGBUF_REP_FLUSH displays replication system messages. */ typedef struct __db_msgbuf { char *buf; /* Heap allocated buffer. */ char *cur; /* Current end of message. */ size_t len; /* Allocated length of buffer. */ + int flags; } DB_MSGBUF; +#define DB_MSGBUF_PREALLOCATED 0x0001 + #define DB_MSGBUF_INIT(a) do { \ (a)->buf = (a)->cur = NULL; \ - (a)->len = 0; \ + (a)->len = (a)->flags = 0; \ } while (0) #define DB_MSGBUF_FLUSH(env, a) do { \ if ((a)->buf != NULL) { \ if ((a)->cur != (a)->buf) \ __db_msg(env, "%s", (a)->buf); \ - __os_free(env, (a)->buf); \ + if (!F_ISSET((a), DB_MSGBUF_PREALLOCATED)) \ + __os_free(env, (a)->buf); \ DB_MSGBUF_INIT(a); \ } \ } while (0) @@ -393,18 +399,14 @@ typedef struct __db_msgbuf { if (regular_msg) \ DB_MSGBUF_FLUSH(env, a); \ else { \ - __os_free(env, (a)->buf); \ + if (!F_ISSET((a), DB_MSGBUF_PREALLOCATED)) \ + __os_free(env, (a)->buf); \ DB_MSGBUF_INIT(a); \ } \ } \ } while (0) -#define STAT_FMT(msg, fmt, type, v) do { \ - DB_MSGBUF __mb; \ - DB_MSGBUF_INIT(&__mb); \ - __db_msgadd(env, &__mb, fmt, (type)(v)); \ - __db_msgadd(env, &__mb, "\t%s", msg); \ - DB_MSGBUF_FLUSH(env, &__mb); \ -} while (0) +#define STAT_FMT(msg, fmt, type, v) \ + __db_msg(env, fmt "\t%s", (type)(v), msg); #define STAT_HEX(msg, v) \ __db_msg(env, "%#lx\t%s", (u_long)(v), msg) #define STAT_ISSET(msg, p) \ @@ -442,25 +444,21 @@ typedef struct __db_msgbuf { * * Error message IDs are automatically assigned by dist/s_message_id script. */ -#ifdef HAVE_LOCALIZATION -#define _(msg) msg /* Replace with localization function. */ -#else -#define _(msg) msg -#endif - #ifdef HAVE_STRIPPED_MESSAGES #define DB_STR_C(msg, fmt) fmt #else -#define DB_STR_C(msg, fmt) _(msg) +#define DB_STR_C(msg, fmt) msg #endif -#define DB_MSGID(id) "BDB" id - -#define DB_STR(id, msg) DB_MSGID(id) " " DB_STR_C(msg, "") - -#define DB_STR_A(id, msg, fmt) DB_MSGID(id) " " DB_STR_C(msg, fmt) +#ifdef HAVE_LOCALIZATION +#define _(msg) (msg) /* Replace with localization function. */ +#else +#define _(msg) msg +#endif -#define DB_STR_P(msg) _(msg) +#define DB_STR(id, msg) _("BDB" id " " DB_STR_C(msg, "")) +#define DB_STR_A(id, msg, fmt) _("BDB" id " " DB_STR_C(msg, fmt)) +#define DB_STR_P(msg) _(msg) /* * There are quite a few places in Berkeley DB where we want to initialize @@ -543,6 +541,7 @@ typedef struct __db_msgbuf { /* Type passed to __db_appname(). */ typedef enum { DB_APP_NONE=0, /* No type (region). */ + DB_APP_BLOB, /* Blob file. */ DB_APP_DATA, /* Data file. */ DB_APP_LOG, /* Log file. */ DB_APP_META, /* Persistent metadata file. */ @@ -613,8 +612,13 @@ typedef enum { if (F_ISSET((env), ENV_OPEN_CALLED)) \ ENV_REQUIRES_CONFIG(env, handle, i, flags) +/* + * The ENV_ENTER and ENV_LEAVE macros announce to other threads that + * the current thread is entering or leaving the BDB api. + */ #define ENV_ENTER_RET(env, ip, ret) do { \ ret = 0; \ + DISCARD_HISTORY(env); \ PANIC_CHECK_RET(env, ret); \ if (ret == 0) { \ if ((env)->thr_hashtab == NULL) \ @@ -632,6 +636,10 @@ typedef enum { return (__ret); \ } while (0) +/* + * Publicize the current thread's intention to run failchk. This invokes + * DB_ENV->is_alive() in the mutex code, to avoid hanging on dead processes. + */ #define FAILCHK_THREAD(env, ip) do { \ if ((ip) != NULL) \ (ip)->dbth_state = THREAD_FAILCHK; \ @@ -639,20 +647,15 @@ typedef enum { #define ENV_GET_THREAD_INFO(env, ip) ENV_ENTER(env, ip) -#ifdef DIAGNOSTIC #define ENV_LEAVE(env, ip) do { \ - if ((ip) != NULL) { \ - DB_ASSERT(env, ((ip)->dbth_state == THREAD_ACTIVE || \ - (ip)->dbth_state == THREAD_FAILCHK)); \ + if ((ip) != NULL) { \ + DB_ASSERT((env), (ip)->dbth_state == THREAD_ACTIVE || \ + (ip)->dbth_state == THREAD_FAILCHK); \ (ip)->dbth_state = THREAD_OUT; \ } \ } while (0) -#else -#define ENV_LEAVE(env, ip) do { \ - if ((ip) != NULL) \ - (ip)->dbth_state = THREAD_OUT; \ -} while (0) -#endif + + #ifdef DIAGNOSTIC #define CHECK_THREAD(env) do { \ if ((env)->thr_hashtab != NULL) \ @@ -689,6 +692,23 @@ typedef struct __pin_list { } PIN_LIST; #define PINMAX 4 +typedef enum { + MUTEX_ACTION_UNLOCKED=0, + MUTEX_ACTION_INTEND_SHARE, /* Thread is attempting a read-lock. */ + MUTEX_ACTION_SHARED /* Thread has gotten a read lock. */ +} MUTEX_ACTION; + +typedef struct __mutex_state { /* SHARED */ + db_mutex_t mutex; + MUTEX_ACTION action; +#ifdef DIAGNOSTIC + db_timespec when; +#endif +} MUTEX_STATE; + +#define MUTEX_STATE_MAX 10 /* It only needs enough for shared latches. */ + + struct __db_thread_info { /* SHARED */ pid_t dbth_pid; db_threadid_t dbth_tid; @@ -708,11 +728,25 @@ struct __db_thread_info { /* SHARED */ u_int16_t dbth_pinmax; /* Number of slots allocated. */ roff_t dbth_pinlist; /* List of pins. */ PIN_LIST dbth_pinarray[PINMAX]; /* Initial array of slots. */ + + /* + * While thread tracking is active this caches one of the lockers + * created by each thread. This locker remains allocated, with an + * invalid id, even after the locker id is freed. + */ + roff_t dbth_local_locker; + /* + * Each latch shared by this thread has an entry here. Exclusive + * ownership, for both latches and mutexes, are in the DB_MUTEX. + */ + MUTEX_STATE dbth_latches[MUTEX_STATE_MAX]; #ifdef DIAGNOSTIC roff_t dbth_locker; /* Current locker for this thread. */ u_int32_t dbth_check_off; /* Count of number of LOCK_OFF calls. */ #endif + db_timespec dbth_failtime; /* Time when its crash was detected. */ }; + #ifdef DIAGNOSTIC #define LOCK_CHECK_OFF(ip) if ((ip) != NULL) \ (ip)->dbth_check_off++ @@ -730,7 +764,7 @@ struct __db_thread_info { /* SHARED */ #define LOCK_CHECK(dbc, pgno, mode) NOP_STATEMENT #endif -typedef struct __env_thread_info { +typedef struct __env_thread_info { /* SHARED */ u_int32_t thr_count; u_int32_t thr_init; u_int32_t thr_max; @@ -804,6 +838,11 @@ struct __env { #define ENV_DEF_DATA_LEN 100 u_int32_t data_len; /* Data length in __db_prbytes. */ + /* Registered processes */ + size_t num_active_pids; /* number of entries in active_pids */ + size_t size_active_pids; /* allocated size of active_pids */ + pid_t *active_pids; /* array active pids */ + /* Thread tracking */ u_int32_t thr_nbucket; /* Number of hash buckets */ DB_HASHTAB *thr_hashtab; /* Hash table of DB_THREAD_INFO */ @@ -867,6 +906,7 @@ struct __env { #define DB_TEST_PREOPEN 10 /* before __os_open */ #define DB_TEST_REPMGR_PERM 11 /* repmgr perm/archiving tests */ #define DB_TEST_SUBDB_LOCKS 12 /* subdb locking tests */ +#define DB_TEST_REPMGR_HEARTBEAT 13 /* repmgr stop sending heartbeats */ int test_abort; /* Abort value for testing */ int test_check; /* Checkpoint value for testing */ int test_copy; /* Copy value for testing */ @@ -882,7 +922,9 @@ struct __env { #define ENV_REF_COUNTED 0x00000100 /* Region references this handle */ #define ENV_SYSTEM_MEM 0x00000200 /* DB_SYSTEM_MEM set */ #define ENV_THREAD 0x00000400 /* DB_THREAD set */ -#define ENV_FORCE_TXN_BULK 0x00000800 /* Txns use bulk mode-for testing */ +#define ENV_FORCE_TXN_BULK 0x00000800 /* Txns use bulk mode-for testing */ +#define ENV_REMEMBER_PANIC 0x00001000 /* Panic was on during cleanup. */ +#define ENV_FORCESYNCENV 0x00002000 /* Force msync on closing. */ u_int32_t flags; }; @@ -1107,7 +1149,6 @@ typedef struct __dbpginfo { #include "dbinc/globals.h" -#include "dbinc/clock.h" #include "dbinc/debug.h" #include "dbinc/region.h" #include "dbinc_auto/env_ext.h" @@ -1119,6 +1160,7 @@ typedef struct __dbpginfo { #include "dbinc/os.h" #include "dbinc_auto/clib_ext.h" #include "dbinc_auto/common_ext.h" +#include "dbinc_auto/blob_ext.h" /******************************************************* * Remaining Log. diff --git a/build_windows/dbkill.cpp b/build_windows/dbkill.cpp index 3f49716f..bb4633ff 100644 --- a/build_windows/dbkill.cpp +++ b/build_windows/dbkill.cpp @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/build_windows/include.tcl b/build_windows/include.tcl index ac906e40..6d789737 100644 --- a/build_windows/include.tcl +++ b/build_windows/include.tcl @@ -2,7 +2,7 @@ set tclsh_path SET_YOUR_TCLSH_PATH set buildpath Win32/Debug -set tcllib libdb_tcl53d.dll +set tcllib libdb_tcl61d.dll set src_root .. set test_path ../test/tcl @@ -15,6 +15,7 @@ set testdir ./TESTDIR global dict global util_path +global is_aix_test global is_freebsd_test global is_hp_test global is_linux_test diff --git a/build_windows/libdb.def b/build_windows/libdb.def index d4f3158f..7f77829d 100644 --- a/build_windows/libdb.def +++ b/build_windows/libdb.def @@ -71,165 +71,178 @@ EXPORTS __os_realloc @68 __os_rename @69 __os_strdup @70 - __os_umalloc @71 - __os_unlink @72 - __os_write @73 - __txn_id_set @74 - __bam_adj_desc @75 - __bam_cadjust_desc @76 - __bam_cdel_desc @77 - __bam_curadj_desc @78 - __bam_irep_desc @79 - __bam_merge_44_desc @80 - __bam_pgin @81 - __bam_pgout @82 - __bam_rcuradj_desc @83 - __bam_relink_43_desc @84 - __bam_repl_desc @85 - __bam_root_desc @86 - __bam_rsplit_desc @87 - __bam_split_42_desc @88 - __bam_split_48_desc @89 - __bam_split_desc @90 - __bam_traverse @91 - __crdel_inmem_create_desc @92 - __crdel_inmem_remove_desc @93 - __crdel_inmem_rename_desc @94 - __crdel_metasub_desc @95 - __db_Cstrsep @96 - __db_add_recovery_int @97 - __db_addrem_42_desc @98 - __db_addrem_desc @99 - __db_big_42_desc @100 - __db_big_desc @101 - __db_cksum_desc @102 - __db_close @103 - __db_compress_count_int @104 - __db_compress_int @105 - __db_debug_desc @106 - __db_decompress_count_int @107 - __db_decompress_int @108 - __db_decompress_int32 @109 - __db_dispatch @110 - __db_dl @111 - __db_dumptree @112 - __db_err @113 - __db_errx @114 - __db_getlong @115 - __db_getulong @116 - __db_global_values @117 - __db_isbigendian @118 - __db_merge_desc @119 - __db_mkpath @120 - __db_msg @121 - __db_noop_desc @122 - __db_ovref_desc @123 - __db_pg_alloc_42_desc @124 - __db_pg_alloc_desc @125 - __db_pg_free_42_desc @126 - __db_pg_free_desc @127 - __db_pg_freedata_42_desc @128 - __db_pg_freedata_desc @129 - __db_pg_init_desc @130 - __db_pg_sort_44_desc @131 - __db_pg_trunc_desc @132 - __db_pgin @133 - __db_pgno_desc @134 - __db_pgout @135 - __db_pr_callback @136 - __db_realloc_desc @137 - __db_relink_42_desc @138 - __db_relink_desc @139 - __db_rpath @140 - __db_stat_pp @141 - __db_stat_print_pp @142 - __db_util_cache @143 - __db_util_interrupted @144 - __db_util_logset @145 - __db_util_siginit @146 - __db_util_sigresend @147 - __db_verify_internal @148 - __dbreg_register_desc @149 - __dbt_usercopy @150 - __dbt_userfree @151 - __fop_create_42_desc @152 - __fop_create_desc @153 - __fop_file_remove_desc @154 - __fop_remove_desc @155 - __fop_rename_42_desc @156 - __fop_rename_desc @157 - __fop_write_42_desc @158 - __fop_write_desc @159 - __ham_changeslot_desc @160 - __ham_chgpg_desc @161 - __ham_contract_desc @162 - __ham_copypage_desc @163 - __ham_curadj_desc @164 - __ham_get_meta @165 - __ham_groupalloc_42_desc @166 - __ham_groupalloc_desc @167 - __ham_insdel_42_desc @168 - __ham_insdel_desc @169 - __ham_metagroup_42_desc @170 - __ham_metagroup_desc @171 - __ham_newpage_desc @172 - __ham_pgin @173 - __ham_pgout @174 - __ham_release_meta @175 - __ham_replace_42_desc @176 - __ham_replace_desc @177 - __ham_splitdata_desc @178 - __heap_addrem_desc @179 - __heap_exist @180 - __heap_init_print @181 - __heap_pg_alloc_desc @182 - __heap_trunc_meta_desc @183 - __heap_trunc_page_desc @184 - __lock_list_print @185 - __log_current_lsn @186 - __log_print_record @187 - __log_stat_pp @188 - __log_verify_pp @189 - __log_verify @190 - __mutex_set_wait_info @191 - __os_abort @192 - __os_abspath @193 - __os_cpu_count @194 - __os_ctime @195 - __os_exists @196 - __os_fdlock @197 - __os_fileid @198 - __os_freeaddrinfo @199 - __os_get_errno @200 - __os_getaddrinfo @201 - __os_gettime @202 - __os_id @203 - __os_io @204 - __os_isroot @205 - __os_mapfile @206 - __os_physwrite @207 - __os_seek @208 - __os_set_errno @209 - __os_truncate @210 - __os_ufree @211 - __os_unique_id @212 - __os_unmapfile @213 - __os_urealloc @214 - __os_yield @215 - __qam_add_desc @216 - __qam_del_desc @217 - __qam_delext_desc @218 - __qam_incfirst_desc @219 - __qam_mvptr_desc @220 - __qam_pgin_out @221 - __rep_stat_print @222 - __repmgr_member_desc @223 - __txn_child_desc @224 - __txn_ckp_42_desc @225 - __txn_ckp_desc @226 - __txn_prepare_desc @227 - __txn_recycle_desc @228 - __txn_regop_42_desc @229 - __txn_regop_desc @230 - __txn_xa_regop_42_desc @231 - __repmgr_getaddr @232 + __os_support_direct_io @71 + __os_umalloc @72 + __os_unlink @73 + __os_write @74 + __repmgr_get_incoming_queue_fullevent @75 + __repmgr_get_incoming_queue_redzone @76 + __txn_id_set @77 + __bam_adj_desc @78 + __bam_cadjust_desc @79 + __bam_cdel_desc @80 + __bam_curadj_desc @81 + __bam_irep_desc @82 + __bam_merge_44_desc @83 + __bam_pgin @84 + __bam_pgout @85 + __bam_rcuradj_desc @86 + __bam_relink_43_desc @87 + __bam_repl_desc @88 + __bam_root_desc @89 + __bam_rsplit_desc @90 + __bam_split_42_desc @91 + __bam_split_48_desc @92 + __bam_split_desc @93 + __bam_traverse @94 + __crdel_inmem_create_desc @95 + __crdel_inmem_remove_desc @96 + __crdel_inmem_rename_desc @97 + __crdel_metasub_desc @98 + __db_Cstrsep @99 + __db_add_recovery_int @100 + __db_addrem_42_desc @101 + __db_addrem_desc @102 + __db_big_42_desc @103 + __db_big_desc @104 + __db_cksum_desc @105 + __db_close @106 + __db_compress_count_int @107 + __db_compress_int @108 + __db_debug_desc @109 + __db_decompress_count_int @110 + __db_decompress_int @111 + __db_decompress_int32 @112 + __db_dispatch @113 + __db_dl @114 + __db_dumptree @115 + __db_err @116 + __db_errx @117 + __db_getlong @118 + __db_getulong @119 + __db_global_values @120 + __db_isbigendian @121 + __db_merge_desc @122 + __db_mkpath @123 + __db_msg @124 + __db_noop_desc @125 + __db_ovref_desc @126 + __db_pg_alloc_42_desc @127 + __db_pg_alloc_desc @128 + __db_pg_free_42_desc @129 + __db_pg_free_desc @130 + __db_pg_freedata_42_desc @131 + __db_pg_freedata_desc @132 + __db_pg_init_desc @133 + __db_pg_sort_44_desc @134 + __db_pg_trunc_desc @135 + __db_pgin @136 + __db_pgno_desc @137 + __db_pgout @138 + __db_pr_callback @139 + __db_realloc_desc @140 + __db_relink_42_desc @141 + __db_relink_desc @142 + __db_rpath @143 + __db_stat_pp @144 + __db_stat_print_pp @145 + __db_util_cache @146 + __db_util_interrupted @147 + __db_util_logset @148 + __db_util_siginit @149 + __db_util_sigresend @150 + __db_verify_internal @151 + __dbreg_register_desc @152 + __dbreg_register_42_desc @153 + __dbt_usercopy @154 + __dbt_userfree @155 + __fop_create_42_desc @156 + __fop_create_60_desc @157 + __fop_create_desc @158 + __fop_file_remove_60_desc @159 + __fop_file_remove_desc @160 + __fop_remove_60_desc @161 + __fop_remove_desc @162 + __fop_rename_42_desc @163 + __fop_rename_60_desc @164 + __fop_rename_desc @165 + __fop_write_42_desc @166 + __fop_write_60_desc @167 + __fop_write_desc @168 + __fop_write_file_60_desc @169 + __fop_write_file_desc @170 + __ham_changeslot_desc @171 + __ham_chgpg_desc @172 + __ham_contract_desc @173 + __ham_copypage_desc @174 + __ham_curadj_desc @175 + __ham_get_meta @176 + __ham_groupalloc_42_desc @177 + __ham_groupalloc_desc @178 + __ham_insdel_42_desc @179 + __ham_insdel_desc @180 + __ham_metagroup_42_desc @181 + __ham_metagroup_desc @182 + __ham_newpage_desc @183 + __ham_pgin @184 + __ham_pgout @185 + __ham_release_meta @186 + __ham_replace_42_desc @187 + __ham_replace_desc @188 + __ham_splitdata_desc @189 + __heap_addrem_60_desc @190 + __heap_addrem_50_desc @191 + __heap_addrem_desc @192 + __heap_exist @193 + __heap_pg_alloc_desc @194 + __heap_trunc_meta_desc @195 + __heap_trunc_page_desc @196 + __lock_list_print @197 + __log_current_lsn @198 + __log_print_record @199 + __log_stat_pp @200 + __log_verify_pp @201 + __log_verify @202 + __mutex_set_wait_info @203 + __os_abort @204 + __os_abspath @205 + __os_cpu_count @206 + __os_ctime @207 + __os_exists @208 + __os_fdlock @209 + __os_fileid @210 + __os_freeaddrinfo @211 + __os_get_errno @212 + __os_getaddrinfo @213 + __os_gettime @214 + __os_id @215 + __os_io @216 + __os_isroot @217 + __os_mapfile @218 + __os_physwrite @219 + __os_seek @220 + __os_set_errno @221 + __os_truncate @222 + __os_ufree @223 + __os_unique_id @224 + __os_unmapfile @225 + __os_urealloc @226 + __os_yield @227 + __qam_add_desc @228 + __qam_del_desc @229 + __qam_delext_desc @230 + __qam_incfirst_desc @231 + __qam_mvptr_desc @232 + __qam_pgin_out @233 + __rep_stat_print @234 + __repmgr_member_desc @235 + __txn_child_desc @236 + __txn_ckp_42_desc @237 + __txn_ckp_desc @238 + __txn_prepare_desc @239 + __txn_recycle_desc @240 + __txn_regop_42_desc @241 + __txn_regop_desc @242 + __txn_xa_regop_42_desc @243 + __repmgr_getaddr @244 + __db_ctimespec @245 diff --git a/build_windows/libdb.rc b/build_windows/libdb.rc index ccd49ac0..b627e334 100644 --- a/build_windows/libdb.rc +++ b/build_windows/libdb.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 5,0,3,21 - PRODUCTVERSION 5,0,3,21 + FILEVERSION 6,0,1,23 + PRODUCTVERSION 6,0,1,23 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -17,13 +17,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Oracle\0" - VALUE "FileDescription", "Berkeley DB 5.3 DLL\0" - VALUE "FileVersion", "5.3.21\0" - VALUE "InternalName", "libdb53.dll\0" - VALUE "LegalCopyright", "Copyright © Oracle 1997-2012\0" - VALUE "OriginalFilename", "libdb53.dll\0" + VALUE "FileDescription", "Berkeley DB 6.1 DLL\0" + VALUE "FileVersion", "6.1.23\0" + VALUE "InternalName", "libdb61.dll\0" + VALUE "LegalCopyright", "Copyright © Oracle 1997, 2015\0" + VALUE "OriginalFilename", "libdb61.dll\0" VALUE "ProductName", "Oracle libdb\0" - VALUE "ProductVersion", "5.3.21\0" + VALUE "ProductVersion", "6.1.23\0" END END BLOCK "VarFileInfo" diff --git a/build_windows/libdb_small.def b/build_windows/libdb_small.def index e090e017..d3534850 100644 --- a/build_windows/libdb_small.def +++ b/build_windows/libdb_small.def @@ -48,129 +48,139 @@ EXPORTS __os_realloc @45 __os_rename @46 __os_strdup @47 - __os_umalloc @48 - __os_unlink @49 - __os_write @50 - __txn_id_set @51 - __bam_adj_desc @52 - __bam_cadjust_desc @53 - __bam_cdel_desc @54 - __bam_curadj_desc @55 - __bam_irep_desc @56 - __bam_merge_44_desc @57 - __bam_pgin @58 - __bam_pgout @59 - __bam_rcuradj_desc @60 - __bam_relink_43_desc @61 - __bam_repl_desc @62 - __bam_root_desc @63 - __bam_rsplit_desc @64 - __bam_split_42_desc @65 - __bam_split_48_desc @66 - __bam_split_desc @67 - __bam_traverse @68 - __crdel_inmem_create_desc @69 - __crdel_inmem_remove_desc @70 - __crdel_inmem_rename_desc @71 - __crdel_metasub_desc @72 - __db_Cstrsep @73 - __db_add_recovery_int @74 - __db_addrem_42_desc @75 - __db_addrem_desc @76 - __db_big_42_desc @77 - __db_big_desc @78 - __db_cksum_desc @79 - __db_close @80 - __db_debug_desc @81 - __db_dispatch @82 - __db_dl @83 - __db_dumptree @84 - __db_err @85 - __db_errx @86 - __db_getlong @87 - __db_getulong @88 - __db_global_values @89 - __db_isbigendian @90 - __db_merge_desc @91 - __db_mkpath @92 - __db_msg @93 - __db_noop_desc @94 - __db_ovref_desc @95 - __db_pg_alloc_42_desc @96 - __db_pg_alloc_desc @97 - __db_pg_free_42_desc @98 - __db_pg_free_desc @99 - __db_pg_freedata_42_desc @100 - __db_pg_freedata_desc @101 - __db_pg_init_desc @102 - __db_pg_sort_44_desc @103 - __db_pg_trunc_desc @104 - __db_pgin @105 - __db_pgno_desc @106 - __db_pgout @107 - __db_pr_callback @108 - __db_realloc_desc @109 - __db_relink_42_desc @110 - __db_relink_desc @111 - __db_rpath @112 - __db_stat_pp @113 - __db_stat_print_pp @114 - __db_util_cache @115 - __db_util_interrupted @116 - __db_util_logset @117 - __db_util_siginit @118 - __db_util_sigresend @119 - __db_verify_internal @120 - __dbreg_register_desc @121 - __dbt_usercopy @122 - __dbt_userfree @123 - __fop_create_42_desc @124 - __fop_create_desc @125 - __fop_file_remove_desc @126 - __fop_remove_desc @127 - __fop_rename_42_desc @128 - __fop_rename_desc @129 - __fop_write_42_desc @130 - __fop_write_desc @131 - __ham_pgin @132 - __ham_pgout @133 - __heap_exist @134 - __heap_init_print @135 - __lock_list_print @136 - __log_current_lsn @137 - __log_stat_pp @138 - __log_verify_pp @139 - __log_verify @140 - __mutex_set_wait_info @141 - __os_abort @142 - __os_abspath @143 - __os_cpu_count @144 - __os_ctime @145 - __os_exists @146 - __os_fdlock @147 - __os_fileid @148 - __os_get_errno @149 - __os_gettime @150 - __os_id @151 - __os_io @152 - __os_isroot @153 - __os_mapfile @154 - __os_physwrite @155 - __os_seek @156 - __os_set_errno @157 - __os_truncate @158 - __os_ufree @159 - __os_unique_id @160 - __os_unmapfile @161 - __os_urealloc @162 - __os_yield @163 - __qam_pgin_out @164 - __rep_stat_print @165 - __txn_child_desc @166 - __txn_ckp_42_desc @167 - __txn_ckp_desc @168 - __txn_prepare_desc @169 - __txn_recycle_desc @170 - __txn_regop_42_desc @171 - __txn_regop_desc @172 - __txn_xa_regop_42_desc @173 + __os_support_direct_io @48 + __os_umalloc @49 + __os_unlink @50 + __os_write @51 + __repmgr_get_incoming_queue_fullevent @52 + __repmgr_get_incoming_queue_redzone @53 + __txn_id_set @54 + __bam_adj_desc @55 + __bam_cadjust_desc @56 + __bam_cdel_desc @57 + __bam_curadj_desc @58 + __bam_irep_desc @59 + __bam_merge_44_desc @60 + __bam_pgin @61 + __bam_pgout @62 + __bam_rcuradj_desc @63 + __bam_relink_43_desc @64 + __bam_repl_desc @65 + __bam_root_desc @66 + __bam_rsplit_desc @67 + __bam_split_42_desc @68 + __bam_split_48_desc @69 + __bam_split_desc @70 + __bam_traverse @71 + __crdel_inmem_create_desc @72 + __crdel_inmem_remove_desc @73 + __crdel_inmem_rename_desc @74 + __crdel_metasub_desc @75 + __db_Cstrsep @76 + __db_add_recovery_int @77 + __db_addrem_42_desc @78 + __db_addrem_desc @79 + __db_big_42_desc @80 + __db_big_desc @81 + __db_cksum_desc @82 + __db_close @83 + __db_debug_desc @84 + __db_dispatch @85 + __db_dl @86 + __db_dumptree @87 + __db_err @88 + __db_errx @89 + __db_getlong @90 + __db_getulong @91 + __db_global_values @92 + __db_isbigendian @93 + __db_merge_desc @94 + __db_mkpath @95 + __db_msg @96 + __db_noop_desc @97 + __db_ovref_desc @98 + __db_pg_alloc_42_desc @99 + __db_pg_alloc_desc @100 + __db_pg_free_42_desc @101 + __db_pg_free_desc @102 + __db_pg_freedata_42_desc @103 + __db_pg_freedata_desc @104 + __db_pg_init_desc @105 + __db_pg_sort_44_desc @106 + __db_pg_trunc_desc @107 + __db_pgin @108 + __db_pgno_desc @109 + __db_pgout @110 + __db_pr_callback @111 + __db_realloc_desc @112 + __db_relink_42_desc @113 + __db_relink_desc @114 + __db_rpath @115 + __db_stat_pp @116 + __db_stat_print_pp @117 + __db_util_cache @118 + __db_util_interrupted @119 + __db_util_logset @120 + __db_util_siginit @121 + __db_util_sigresend @122 + __db_verify_internal @123 + __dbreg_register_desc @124 + __dbreg_register_42_desc @125 + __dbt_usercopy @126 + __dbt_userfree @127 + __fop_create_42_desc @128 + __fop_create_60_desc @129 + __fop_create_desc @130 + __fop_file_remove_60_desc @131 + __fop_file_remove_desc @132 + __fop_remove_60_desc @133 + __fop_remove_desc @134 + __fop_rename_42_desc @135 + __fop_rename_60_desc @136 + __fop_rename_desc @137 + __fop_write_42_desc @138 + __fop_write_60_desc @139 + __fop_write_desc @140 + __fop_write_file_60_desc @141 + __fop_write_file_desc @142 + __ham_pgin @143 + __ham_pgout @144 + __heap_exist @145 + __lock_list_print @146 + __log_current_lsn @147 + __log_stat_pp @148 + __log_verify_pp @149 + __log_verify @150 + __mutex_set_wait_info @151 + __os_abort @152 + __os_abspath @153 + __os_cpu_count @154 + __os_ctime @155 + __os_exists @156 + __os_fdlock @157 + __os_fileid @158 + __os_get_errno @159 + __os_gettime @160 + __os_id @161 + __os_io @162 + __os_isroot @163 + __os_mapfile @164 + __os_physwrite @165 + __os_seek @166 + __os_set_errno @167 + __os_truncate @168 + __os_ufree @169 + __os_unique_id @170 + __os_unmapfile @171 + __os_urealloc @172 + __os_yield @173 + __qam_pgin_out @174 + __rep_stat_print @175 + __txn_child_desc @176 + __txn_ckp_42_desc @177 + __txn_ckp_desc @178 + __txn_prepare_desc @179 + __txn_recycle_desc @180 + __txn_regop_42_desc @181 + __txn_regop_desc @182 + __txn_xa_regop_42_desc @183 diff --git a/build_windows/libdbrc.src b/build_windows/libdbrc.src index 1054fd50..7b56a14f 100644 --- a/build_windows/libdbrc.src +++ b/build_windows/libdbrc.src @@ -20,7 +20,7 @@ BEGIN VALUE "FileDescription", "Berkeley DB %MAJOR%.%MINOR% DLL\0" VALUE "FileVersion", "%MAJOR%.%MINOR%.%PATCH%\0" VALUE "InternalName", "libdb%MAJOR%%MINOR%.dll\0" - VALUE "LegalCopyright", "Copyright © Oracle 1997-2012\0" + VALUE "LegalCopyright", "Copyright © Oracle 1997, 2015\0" VALUE "OriginalFilename", "libdb%MAJOR%%MINOR%.dll\0" VALUE "ProductName", "Oracle libdb\0" VALUE "ProductVersion", "%MAJOR%.%MINOR%.%PATCH%\0" |