diff options
author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-25 00:34:30 +0100 |
---|---|---|
committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-25 00:34:30 +0100 |
commit | 2892a844d43d4c0e8209ad1efc0b135a957a4b8d (patch) | |
tree | 15d657d40fca2a3bed52514c0f7fc79f4e8141aa /VC2010/ZLib.vcxproj | |
parent | Very alpha water physic for pickups (The swim now) (diff) | |
download | cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.tar cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.tar.gz cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.tar.bz2 cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.tar.lz cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.tar.xz cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.tar.zst cuberite-2892a844d43d4c0e8209ad1efc0b135a957a4b8d.zip |
Diffstat (limited to '')
-rw-r--r-- | VC2010/ZLib.vcxproj | 13 | ||||
-rw-r--r-- | VC2010/ZLib.vcxproj.filters | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/VC2010/ZLib.vcxproj b/VC2010/ZLib.vcxproj index fcc0538e1..f71a9eed5 100644 --- a/VC2010/ZLib.vcxproj +++ b/VC2010/ZLib.vcxproj @@ -25,7 +25,6 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -35,7 +34,6 @@ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -63,6 +61,8 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -70,7 +70,9 @@ <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>TurnOffAllWarnings</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
@@ -92,8 +94,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>TurnOffAllWarnings</WarningLevel>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
@@ -114,7 +117,6 @@ <ClCompile Include="..\zlib-1.2.5\compress.c" />
<ClCompile Include="..\zlib-1.2.5\crc32.c" />
<ClCompile Include="..\zlib-1.2.5\deflate.c" />
- <ClCompile Include="..\zlib-1.2.5\example.c" />
<ClCompile Include="..\zlib-1.2.5\gzclose.c" />
<ClCompile Include="..\zlib-1.2.5\gzlib.c" />
<ClCompile Include="..\zlib-1.2.5\gzread.c" />
@@ -123,7 +125,6 @@ <ClCompile Include="..\zlib-1.2.5\inffast.c" />
<ClCompile Include="..\zlib-1.2.5\inflate.c" />
<ClCompile Include="..\zlib-1.2.5\inftrees.c" />
- <ClCompile Include="..\zlib-1.2.5\minigzip.c" />
<ClCompile Include="..\zlib-1.2.5\trees.c" />
<ClCompile Include="..\zlib-1.2.5\uncompr.c" />
<ClCompile Include="..\zlib-1.2.5\zutil.c" />
diff --git a/VC2010/ZLib.vcxproj.filters b/VC2010/ZLib.vcxproj.filters index 7e5dc46b8..b79ce5cce 100644 --- a/VC2010/ZLib.vcxproj.filters +++ b/VC2010/ZLib.vcxproj.filters @@ -27,9 +27,6 @@ <ClCompile Include="..\zlib-1.2.5\deflate.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\zlib-1.2.5\example.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\zlib-1.2.5\gzclose.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -54,9 +51,6 @@ <ClCompile Include="..\zlib-1.2.5\inftrees.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\zlib-1.2.5\minigzip.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\zlib-1.2.5\trees.c">
<Filter>Source Files</Filter>
</ClCompile>
|