Etusivu Tutki Apua
Kirjaudu sisään
oversu
/
fRO_french_translation_rAthena
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Respect the default platform toolset (#2609)

With this you will not have to upgrade your solution everytime you clone a fresh copy of rAthena and the problem with having to stash between branch switches should also be gone.
If you want to compile it for another toolset you simply have to set the target toolset by yourself.
Lemongrass3110 7 vuotta sitten
vanhempi
a49a1a52a3
commit
a2e8d02752
9 muutettua tiedostoa jossa 37 lisäystä ja 39 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 4 5
      3rdparty/libconfig/libconfig.vcxproj
  2. 4 4
      3rdparty/mt19937ar/mt19937ar.vcxproj
  3. 4 5
      3rdparty/yaml-cpp/yaml-cpp.vcxproj
  4. 4 4
      src/char/char-server.vcxproj
  5. 4 4
      src/common/common-minicore.vcxproj
  6. 4 4
      src/common/common.vcxproj
  7. 5 5
      src/login/login-server.vcxproj
  8. 4 4
      src/map/map-server.vcxproj
  9. 4 4
      src/tool/map-cache.vcxproj

+ 4 - 5
3rdparty/libconfig/libconfig.vcxproj
Näytä tiedosto 

@@ -38,32 +38,31 @@
 
     <ProjectGuid>{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}</ProjectGuid>
 
     <Keyword>Win32Proj</Keyword>
 
     <RootNamespace>libconfig</RootNamespace>
 
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
 
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 4 - 4
3rdparty/mt19937ar/mt19937ar.vcxproj
Näytä tiedosto 

@@ -33,26 +33,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 4 - 5
3rdparty/yaml-cpp/yaml-cpp.vcxproj
Näytä tiedosto 

@@ -22,32 +22,31 @@
 
     <ProjectGuid>{61D6A599-6BED-4154-A9FC-40553BD972E0}</ProjectGuid>
 
     <Keyword>Win32Proj</Keyword>
 
     <RootNamespace>yamlcpp</RootNamespace>
 
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
 
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 4 - 4
src/char/char-server.vcxproj
Näytä tiedosto 

@@ -27,26 +27,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 4 - 4
src/common/common-minicore.vcxproj
Näytä tiedosto 

@@ -66,26 +66,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 4 - 4
src/common/common.vcxproj
Näytä tiedosto 

@@ -86,26 +86,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>StaticLibrary</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 5 - 5
src/login/login-server.vcxproj
Näytä tiedosto 

@@ -27,26 +27,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
@@ -166,7 +166,7 @@
 
   <ItemGroup>
 
     <ClCompile Include="account.cpp" />
 
     <ClCompile Include="ipban.cpp" />
 
-    <ClCompile Include="login.cpp"/>
 
+    <ClCompile Include="login.cpp" />
 
     <ClCompile Include="loginchrif.cpp" />
 
     <ClCompile Include="loginclif.cpp" />
 
     <ClCompile Include="logincnslif.cpp" />

+ 4 - 4
src/map/map-server.vcxproj
Näytä tiedosto 

@@ -27,26 +27,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>

+ 4 - 4
src/tool/map-cache.vcxproj
Näytä tiedosto 

@@ -27,26 +27,26 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>true</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 
     <ConfigurationType>Application</ConfigurationType>
 
     <UseDebugLibraries>false</UseDebugLibraries>
 
-    <PlatformToolset>v120</PlatformToolset>
 
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
 
     <WholeProgramOptimization>true</WholeProgramOptimization>
 
     <CharacterSet>MultiByte</CharacterSet>
 
   </PropertyGroup>