diff options
Diffstat (limited to 'win/VC80/shared.vcproj')
| -rw-r--r-- | win/VC80/shared.vcproj | 360 |
1 files changed, 230 insertions, 130 deletions
diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj index 3824e5ae494..9ae4929de01 100644 --- a/win/VC80/shared.vcproj +++ b/win/VC80/shared.vcproj @@ -52,7 +52,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" @@ -80,6 +79,7 @@ Name="VCLibrarianTool" AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -135,7 +135,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" @@ -163,6 +162,7 @@ Name="VCLibrarianTool" AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -214,7 +214,6 @@ PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" @@ -242,6 +241,86 @@ Name="VCLibrarianTool" AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib" + OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" SuppressStartupBanner="true" /> <Tool @@ -295,7 +374,6 @@ PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" @@ -323,6 +401,88 @@ Name="VCLibrarianTool" AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib user32.lib" + OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" SuppressStartupBanner="true" /> <Tool @@ -373,14 +533,6 @@ > </File> <File - RelativePath="..\..\src\shared\Database\DatabaseSqlite.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\DatabaseSqlite.h" - > - </File> - <File RelativePath="..\..\src\shared\Database\Field.cpp" > </File> @@ -405,14 +557,6 @@ > </File> <File - RelativePath="..\..\src\shared\Database\QueryResultSqlite.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\QueryResultSqlite.h" - > - </File> - <File RelativePath="..\..\src\shared\Database\SqlDelayThread.cpp" > </File> @@ -436,63 +580,23 @@ RelativePath="..\..\src\shared\Database\SQLStorage.h" > </File> + <File + RelativePath="..\..\src\shared\Database\SQLStorageImpl.h" + > + </File> <Filter Name="DataStores" > <File - RelativePath="..\..\src\shared\Database\dbcfile.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\dbcfile.h" - > - </File> - <File - RelativePath="..\..\src\shared\Database\DBCfmt.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\src\shared\Database\DBCStores.cpp" + RelativePath="..\..\src\shared\Database\DBCFileLoader.cpp" > </File> <File - RelativePath="..\..\src\shared\Database\DBCStores.h" + RelativePath="..\..\src\shared\Database\DBCFileLoader.h" > </File> <File - RelativePath="..\..\src\shared\Database\DBCStructure.h" + RelativePath="..\..\src\shared\Database\DBCStore.h" > </File> </Filter> @@ -513,14 +617,6 @@ Name="Util" > <File - RelativePath="..\..\src\shared\Base.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Base.h" - > - </File> - <File RelativePath="..\..\src\shared\ByteBuffer.h" > </File> @@ -533,14 +629,6 @@ > </File> <File - RelativePath="..\..\src\shared\Mthread.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Mthread.h" - > - </File> - <File RelativePath="..\..\src\shared\ProgressBar.cpp" > </File> @@ -753,53 +841,57 @@ RelativePath="..\..\src\shared\Common.h" > </File> - <File - RelativePath="..\..\src\shared\revision.h" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> + <File + RelativePath="..\..\src\shared\LockedQueue.h" + > + </File> + <File + RelativePath="..\..\src\shared\revision.h" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\shared\ServiceWin32.cpp" @@ -813,6 +905,14 @@ RelativePath="..\..\src\shared\SystemConfig.h" > </File> + <File + RelativePath="..\..\src\shared\Threading.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\Threading.h" + > + </File> </Files> <Globals> </Globals> |