diff options
author | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
commit | 951b18c97a09426e2f14801263c2fd07efbd46bb (patch) | |
tree | 94303465410557176454305aeeab76a13ca8514d /vcproj-12/char-server.vcxproj | |
parent | 8083daec0d94f78510411c9b225abcfa7e829e95 (diff) | |
parent | 9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 (diff) | |
download | hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.gz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.bz2 hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.xz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'vcproj-12/char-server.vcxproj')
-rw-r--r-- | vcproj-12/char-server.vcxproj | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj index 126f15ea4..710251169 100644 --- a/vcproj-12/char-server.vcxproj +++ b/vcproj-12/char-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -14,19 +14,18 @@ <ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid> <RootNamespace>char-server</RootNamespace> <Keyword>Win32Proj</Keyword> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -141,9 +140,9 @@ <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> <ClInclude Include="..\src\common\cbasetypes.h" /> - <ClInclude Include="..\src\common\conf.h" /> + <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> @@ -175,7 +174,7 @@ <ClInclude Include="..\src\char\int_quest.h" /> <ClInclude Include="..\src\char\int_storage.h" /> <ClInclude Include="..\src\char\inter.h" /> - <ClInclude Include="..\src\char\pincode.h" /> + <ClInclude Include="..\src\char\pincode.h" /> <ClInclude Include="..\src\common\winapi.h" /> </ItemGroup> <ItemGroup> @@ -185,9 +184,9 @@ <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> - <ClCompile Include="..\src\common\conf.c" /> + <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> @@ -217,7 +216,7 @@ <ClCompile Include="..\src\char\int_quest.c" /> <ClCompile Include="..\src\char\int_storage.c" /> <ClCompile Include="..\src\char\inter.c" /> - <ClCompile Include="..\src\char\pincode.c" /> + <ClCompile Include="..\src\char\pincode.c" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> |