Skip to content

Commit e0b3a4b

Browse files
committed
Updated VS 2013 project files to use the VS 2013 compiler
List of changes made to make MTA compatible to the v120 compiler: - Changed return type of CMapEvent::GetName to SString - Added two casts which were implicit in vs2008 to game_sa/CWaterSA.cpp - Fixed implementation-depending file read in game_sa/CAudioContainerSA.cpp - Added C++11 standard conforming variant of SharedUtil.HashMap.h hash_value (#ifdef'ed) This should work fine with a modern gcc as well, but the version currently used to compile MTA isn't compatible with C++11 in this regard. - Added #include <algorithm> to CEGUI and tinygettext for std::min and std::max - Added preprocessor definition PA_WDMKS_NO_KSGUID_LIB to avoid linking to ksguid.lib - Added libspeex.lib built with vs2013 - Added additional #ifdef for va_copy to SString.h and WString.h which is directly available from VS 2013 (Warning) - Disabled /SAFESEH for projects where we can't use it (detours.lib and several bass libraries) The above changes were applied in a compatible manner with VS 2008.
1 parent f208dab commit e0b3a4b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

mak.vs2008/lua5.1c_dll.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Nightly|Win32'" Label="Configuration">
2424
<ConfigurationType>DynamicLibrary</ConfigurationType>
25-
<PlatformToolset>v90</PlatformToolset>
25+
<PlatformToolset>v120</PlatformToolset>
2626
<CharacterSet>MultiByte</CharacterSet>
2727
</PropertyGroup>
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
30-
<PlatformToolset>v90</PlatformToolset>
30+
<PlatformToolset>v120</PlatformToolset>
3131
<CharacterSet>MultiByte</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3434
<ConfigurationType>DynamicLibrary</ConfigurationType>
35-
<PlatformToolset>v90</PlatformToolset>
35+
<PlatformToolset>v120</PlatformToolset>
3636
<CharacterSet>MultiByte</CharacterSet>
3737
</PropertyGroup>
3838
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

mak.vs2008/lua5.1s_dll.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Nightly|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
37-
<PlatformToolset>v90</PlatformToolset>
37+
<PlatformToolset>v120</PlatformToolset>
3838
<CharacterSet>MultiByte</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>DynamicLibrary</ConfigurationType>
42-
<PlatformToolset>v90</PlatformToolset>
42+
<PlatformToolset>v120</PlatformToolset>
4343
<CharacterSet>MultiByte</CharacterSet>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4646
<ConfigurationType>DynamicLibrary</ConfigurationType>
47-
<PlatformToolset>v90</PlatformToolset>
47+
<PlatformToolset>v120</PlatformToolset>
4848
<CharacterSet>MultiByte</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Nightly|x64'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
52-
<PlatformToolset>v90</PlatformToolset>
52+
<PlatformToolset>v120</PlatformToolset>
5353
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5656
<ConfigurationType>DynamicLibrary</ConfigurationType>
57-
<PlatformToolset>v90</PlatformToolset>
57+
<PlatformToolset>v120</PlatformToolset>
5858
<CharacterSet>MultiByte</CharacterSet>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6161
<ConfigurationType>DynamicLibrary</ConfigurationType>
62-
<PlatformToolset>v90</PlatformToolset>
62+
<PlatformToolset>v120</PlatformToolset>
6363
<CharacterSet>MultiByte</CharacterSet>
6464
</PropertyGroup>
6565
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)