Skip to content

Commit

Permalink
本地化
Browse files Browse the repository at this point in the history
  • Loading branch information
@chengn
chengn committed Dec 26, 2012
1 parent b66e279 commit 2750b58
Show file tree
Hide file tree
Showing 12 changed files with 438 additions and 619 deletions.
86 changes: 46 additions & 40 deletions ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,30 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8E75B9C1-D45F-48BC-8C8E-28330E2E12E3}</ProjectGuid>
<ProjectName>Zlib_static</ProjectName>
<ProjectGuid>{D0D57CA2-A972-47FE-92C8-63A3CAAF0E93}</ProjectGuid>
<RootNamespace>Zlib</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -59,14 +62,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)out\$(Platform)\$(Configuration)\temp\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)out\$(Platform)\$(Configuration)\temp\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)out\$(Platform)\$(Configuration)\temp\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)out\$(Platform)\$(Configuration)\temp\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)64\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)64\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)64\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)64\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
Expand All @@ -82,39 +85,40 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
Expand All @@ -124,11 +128,12 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Expand All @@ -144,35 +149,36 @@
<ClCompile Include="..\..\external\zlib123\inffast.c" />
<ClCompile Include="..\..\external\zlib123\inflate.c" />
<ClCompile Include="..\..\external\zlib123\inftrees.c" />
<ClCompile Include="..\..\external\zlib123\trees.c" />
<ClCompile Include="..\..\external\zlib123\uncompr.c" />
<ClCompile Include="..\..\external\zlib123\zutil.c" />
<ClCompile Include="..\..\external\zlib123\contrib\minizip\ioapi.c" />
<ClCompile Include="..\..\external\zlib123\contrib\minizip\iowin32.c" />
<ClCompile Include="..\..\external\zlib123\contrib\minizip\mztools.c" />
<ClCompile Include="..\..\external\zlib123\trees.c" />
<ClCompile Include="..\..\external\zlib123\uncompr.c" />
<ClCompile Include="..\..\external\zlib123\contrib\minizip\unzip.c" />
<ClCompile Include="..\..\external\zlib123\contrib\minizip\zip.c" />
<ClCompile Include="ZipUnzip.cpp" />
<ClCompile Include="..\..\external\zlib123\zutil.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\external\zlib123\crc32.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\crypt.h" />
<ClInclude Include="..\..\external\zlib123\deflate.h" />
<ClInclude Include="..\..\external\zlib123\inffast.h" />
<ClInclude Include="..\..\external\zlib123\inffixed.h" />
<ClInclude Include="..\..\external\zlib123\inflate.h" />
<ClInclude Include="..\..\external\zlib123\inftrees.h" />
<ClInclude Include="..\..\external\zlib123\trees.h" />
<ClInclude Include="..\..\external\zlib123\zconf.h" />
<ClInclude Include="..\..\external\zlib123\zconf.in.h" />
<ClInclude Include="..\..\external\zlib123\zlib.h" />
<ClInclude Include="..\..\external\zlib123\zutil.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\crypt.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\ioapi.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\iowin32.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\mztools.h" />
<ClInclude Include="..\..\external\zlib123\trees.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\unzip.h" />
<ClInclude Include="..\..\external\zlib123\zconf.h" />
<ClInclude Include="..\..\external\zlib123\contrib\minizip\zip.h" />
<ClInclude Include="ZipUnzip.h" />
<ClInclude Include="..\..\external\zlib123\zlib.h" />
<ClInclude Include="..\..\external\zlib123\zutil.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\external\zlib123\README" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
68 changes: 26 additions & 42 deletions ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,8 @@
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="MiniZip Header Files">
<UniqueIdentifier>{3dc059d6-bb27-400a-98a5-7dd2571380c7}</UniqueIdentifier>
</Filter>
<Filter Include="MiniZip Source Files">
<UniqueIdentifier>{5fdbc241-eaa2-4a6e-858f-56e0ef87e1ec}</UniqueIdentifier>
</Filter>
<Filter Include="My">
<UniqueIdentifier>{b111a0de-3137-481f-a49e-a34a34b797f0}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ZipUnzip.cpp">
<Filter>My</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\adler32.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -54,22 +38,19 @@
<ClCompile Include="..\..\external\zlib123\inftrees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\trees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\uncompr.c">
<ClCompile Include="..\..\external\zlib123\contrib\minizip\ioapi.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\zutil.c">
<ClCompile Include="..\..\external\zlib123\contrib\minizip\iowin32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\contrib\minizip\ioapi.c">
<ClCompile Include="..\..\external\zlib123\contrib\minizip\mztools.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\contrib\minizip\iowin32.c">
<ClCompile Include="..\..\external\zlib123\trees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\contrib\minizip\mztools.c">
<ClCompile Include="..\..\external\zlib123\uncompr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\contrib\minizip\unzip.c">
Expand All @@ -78,14 +59,20 @@
<ClCompile Include="..\..\external\zlib123\contrib\minizip\zip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ZipUnzip.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\external\zlib123\zutil.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ZipUnzip.h">
<Filter>My</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\crc32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\crypt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\deflate.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -101,38 +88,35 @@
<ClInclude Include="..\..\external\zlib123\inftrees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\trees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\zconf.in.h">
<ClInclude Include="..\..\external\zlib123\contrib\minizip\ioapi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\zlib.h">
<ClInclude Include="..\..\external\zlib123\contrib\minizip\iowin32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\zutil.h">
<ClInclude Include="..\..\external\zlib123\trees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\crypt.h">
<ClInclude Include="..\..\external\zlib123\contrib\minizip\unzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\ioapi.h">
<ClInclude Include="..\..\external\zlib123\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\iowin32.h">
<ClInclude Include="..\..\external\zlib123\contrib\minizip\zip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\mztools.h">
<ClInclude Include="ZipUnzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\unzip.h">
<ClInclude Include="..\..\external\zlib123\zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\external\zlib123\contrib\minizip\zip.h">
<ClInclude Include="..\..\external\zlib123\zutil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\external\zlib123\README" />
</ItemGroup>
</Project>
Loading

2 comments on commit 2750b58

@linquize
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我们已经升级至 Visual Studio 2012

@chengn
Copy link
Owner Author

@chengn chengn commented on 2750b58 Jan 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这是个好消息

Please sign in to comment.