aboutsummaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to 'externals')
-rw-r--r--externals/ace/win/VC90/ace.vcproj71
-rw-r--r--externals/bzip2/win/VC90/bzip2.vcproj18
-rw-r--r--externals/g3dlite/win/VC90/g3dlite.vcproj70
-rw-r--r--externals/libmpq/win/VC90/libmpq.vcproj19
-rw-r--r--externals/sockets/win/VC90/sockets.vcproj50
-rw-r--r--externals/zlib/win/VC90/zlib.vcproj31
6 files changed, 153 insertions, 106 deletions
diff --git a/externals/ace/win/VC90/ace.vcproj b/externals/ace/win/VC90/ace.vcproj
index 11574ef24b0..35ae4149a81 100644
--- a/externals/ace/win/VC90/ace.vcproj
+++ b/externals/ace/win/VC90/ace.vcproj
@@ -21,8 +21,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
@@ -79,7 +79,7 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)\ACEd.dll"
+ OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACEd.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -112,8 +112,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
@@ -149,7 +149,7 @@
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="WinAcePCH.h"
+ PrecompiledHeaderThrough="WinAcePCH.h"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -171,7 +171,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
- OutputFile="$(OutDir)\ACEd.dll"
+ OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACEd.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -204,8 +204,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
@@ -239,7 +239,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="WinAcePCH.h"
+ PrecompiledHeaderThrough="WinAcePCH.h"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DisableSpecificWarnings="4355"
@@ -259,7 +259,7 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)\ACE.dll"
+ OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACE.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -294,8 +294,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
@@ -329,7 +329,7 @@
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="WinAcePCH.h"
+ PrecompiledHeaderThrough="WinAcePCH.h"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -350,8 +350,9 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="true"
AdditionalOptions="/machine:AMD64"
- OutputFile="$(OutDir)\ACE.dll"
+ OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACE.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -472,7 +473,7 @@
RelativePath="..\..\Atomic_Op_Sparc.c"
>
<FileConfiguration
- Name="Debug"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -480,7 +481,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1260,7 +1261,7 @@
RelativePath="..\..\Rtems_init.c"
>
<FileConfiguration
- Name="Debug"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1268,7 +1269,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -2894,11 +2895,11 @@
>
</File>
<File
- RelativePath="..\..\os_include\os_errno.h"
+ RelativePath="..\..\OS_Errno.h"
>
</File>
<File
- RelativePath="..\..\OS_Errno.h"
+ RelativePath="..\..\os_include\os_errno.h"
>
</File>
<File
@@ -3278,11 +3279,11 @@
>
</File>
<File
- RelativePath="..\..\OS_String.h"
+ RelativePath="..\..\os_include\os_string.h"
>
</File>
<File
- RelativePath="..\..\os_include\os_string.h"
+ RelativePath="..\..\OS_String.h"
>
</File>
<File
@@ -3326,11 +3327,11 @@
>
</File>
<File
- RelativePath="..\..\os_include\sys\os_time.h"
+ RelativePath="..\..\os_include\os_time.h"
>
</File>
<File
- RelativePath="..\..\os_include\os_time.h"
+ RelativePath="..\..\os_include\sys\os_time.h"
>
</File>
<File
@@ -5231,7 +5232,23 @@
RelativePath="..\..\PrecompiledHeaders\WinAcePCH.cpp"
>
<FileConfiguration
- Name="Debug"
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -5239,7 +5256,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/externals/bzip2/win/VC90/bzip2.vcproj b/externals/bzip2/win/VC90/bzip2.vcproj
index e51e847a2a4..de4ca649e37 100644
--- a/externals/bzip2/win/VC90/bzip2.vcproj
+++ b/externals/bzip2/win/VC90/bzip2.vcproj
@@ -45,12 +45,14 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- MinimalRebuild="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -107,9 +109,11 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -148,7 +152,7 @@
IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
- WholeProgramOptimization="1"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -168,13 +172,17 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- EnableIntrinsicFunctions="true"
+ EnableIntrinsicFunctions="false"
+ WholeProgramOptimization="false"
AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/externals/g3dlite/win/VC90/g3dlite.vcproj b/externals/g3dlite/win/VC90/g3dlite.vcproj
index 318eefd1dd4..f70fd21cad8 100644
--- a/externals/g3dlite/win/VC90/g3dlite.vcproj
+++ b/externals/g3dlite/win/VC90/g3dlite.vcproj
@@ -21,8 +21,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -47,14 +47,14 @@
Optimization="0"
AdditionalIncludeDirectories="..\..\..\zlib\;"
AdditionalUsingDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+ AssemblerListingLocation=""
ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
@@ -73,8 +73,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
- IgnoreAllDefaultLibraries="true"
+ IgnoreAllDefaultLibraries="false"
/>
<Tool
Name="VCALinkTool"
@@ -93,9 +94,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
+ Name="Debug|x64"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -113,17 +114,22 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\zlib\;"
AdditionalUsingDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
- RuntimeLibrary="2"
- EnableEnhancedInstructionSet="1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="true"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+ AssemblerListingLocation=""
ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
@@ -142,8 +148,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
- IgnoreAllDefaultLibraries="true"
+ IgnoreAllDefaultLibraries="false"
/>
<Tool
Name="VCALinkTool"
@@ -162,9 +169,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -182,27 +189,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
- Optimization="0"
AdditionalIncludeDirectories="..\..\..\zlib\;"
AdditionalUsingDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
- AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
- ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
- ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
CallingConvention="0"
/>
<Tool
@@ -216,8 +220,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
- IgnoreAllDefaultLibraries="true"
+ IgnoreAllDefaultLibraries="false"
/>
<Tool
Name="VCALinkTool"
@@ -237,8 +242,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -264,7 +269,9 @@
AdditionalIncludeDirectories="..\..\..\zlib\;"
AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
+ StringPooling="true"
RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="0"
AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
@@ -286,8 +293,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
- IgnoreAllDefaultLibraries="true"
+ IgnoreAllDefaultLibraries="false"
/>
<Tool
Name="VCALinkTool"
diff --git a/externals/libmpq/win/VC90/libmpq.vcproj b/externals/libmpq/win/VC90/libmpq.vcproj
index 975eac173a3..13ce6289775 100644
--- a/externals/libmpq/win/VC90/libmpq.vcproj
+++ b/externals/libmpq/win/VC90/libmpq.vcproj
@@ -41,10 +41,11 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
@@ -61,7 +62,7 @@
<Tool
Name="VCLibrarianTool"
LinkLibraryDependencies="true"
- AdditionalLibraryDirectories="..\dep\lib\$(PlatformName)_$(ConfigurationName)"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
@@ -85,7 +86,7 @@
IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
- WholeProgramOptimization="1"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -105,14 +106,16 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- EnableIntrinsicFunctions="true"
+ EnableIntrinsicFunctions="false"
+ WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_NDEBUG"
+ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_NDEBUG"
+ StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1"
WarningLevel="3"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
CompileAs="1"
/>
<Tool
@@ -127,7 +130,7 @@
<Tool
Name="VCLibrarianTool"
LinkLibraryDependencies="true"
- AdditionalLibraryDirectories="..\dep\lib\$(PlatformName)_$(ConfigurationName)"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
diff --git a/externals/sockets/win/VC90/sockets.vcproj b/externals/sockets/win/VC90/sockets.vcproj
index f855843f5de..efa94ef78af 100644
--- a/externals/sockets/win/VC90/sockets.vcproj
+++ b/externals/sockets/win/VC90/sockets.vcproj
@@ -21,8 +21,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -46,7 +46,7 @@
Optimization="0"
AdditionalIncludeDirectories="..\..\include;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
+ MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
@@ -69,6 +69,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
@@ -88,9 +89,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)"
+ Name="Debug|x64"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -108,14 +109,17 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\include;"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- RuntimeLibrary="2"
- EnableEnhancedInstructionSet="1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch"
@@ -135,6 +139,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
@@ -154,9 +159,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -174,17 +179,14 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\include;"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="1"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch"
@@ -204,6 +206,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
@@ -224,8 +227,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -250,7 +253,9 @@
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\include;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@@ -271,6 +276,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ LinkLibraryDependencies="false"
OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
diff --git a/externals/zlib/win/VC90/zlib.vcproj b/externals/zlib/win/VC90/zlib.vcproj
index 1b63254aa23..2b35253a7d0 100644
--- a/externals/zlib/win/VC90/zlib.vcproj
+++ b/externals/zlib/win/VC90/zlib.vcproj
@@ -21,8 +21,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -46,7 +46,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
+ MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
@@ -89,8 +89,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -115,7 +115,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
+ MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
@@ -158,8 +158,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -182,15 +182,17 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+ PrecompiledHeaderFile=""
WarningLevel="3"
Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
CallingConvention="0"
/>
<Tool
@@ -205,6 +207,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\$(ProjectName).lib"
+ IgnoreAllDefaultLibraries="false"
/>
<Tool
Name="VCALinkTool"
@@ -224,8 +227,8 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
- IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
+ OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
@@ -250,7 +253,9 @@
AdditionalOptions="/MP"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"