diff --git a/.appveyor.vs2013.yml b/.appveyor.vs2013.yml deleted file mode 100644 index 6f922c173517..000000000000 --- a/.appveyor.vs2013.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: Wesnoth-VS2013-{branch}-{build} -clone_folder: C:\projects\wesnoth -image: Visual Studio 2013 -configuration: - - Release - - Debug -platform: win32 -skip_branch_with_pr: true -shallow_clone: true -matrix: - fast_finish: true # Stop after a build failure -before_build: - - cd .. - - ps: wget https://github.com/aquileia/external/archive/VC12.zip -O VC12.zip - - 7z x VC12.ZIP - - ren external-VC12 external - - cd wesnoth - - set PATH=C:\projects\external\dll;%PATH% - -notifications: - - provider: Webhook - url: http://ai0867.net:6661/wesnoth - headers: - User-Agent: WesnothAppveyor/1.0 - Version: vs2013 - Num-Versions: 3 - Authorization: TODO - on_build_success: true - on_build_failure: true diff --git a/.appveyor.vs2015.yml b/.appveyor.vs2015.yml index d7c26bff82b9..d1c830a63c7e 100644 --- a/.appveyor.vs2015.yml +++ b/.appveyor.vs2015.yml @@ -15,14 +15,7 @@ before_build: - 7z x VC14.ZIP - ren external-VC14 external - cd wesnoth - - mkdir projectfiles\VC14 - - xcopy /E /I /H /Y projectfiles\VC12 projectfiles\VC14 - - cd projectfiles\VC14 - - "\"c:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\devenv.exe\" wesnoth.sln /upgrade" - - cd ..\.. - set PATH=C:\projects\external\dll;%PATH% -build_script: - - msbuild projectfiles\VC14\wesnoth.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" notifications: - provider: Webhook diff --git a/.appveyor.vs2017.yml b/.appveyor.vs2017.yml index 10efa02b0cb8..fe01483af632 100644 --- a/.appveyor.vs2017.yml +++ b/.appveyor.vs2017.yml @@ -17,7 +17,7 @@ before_build: - cd wesnoth - set PATH=C:\projects\external\dll;%PATH% build_script: - - msbuild projectfiles\VC12\wesnoth.sln /property:PlatformToolset=v141 /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + - msbuild projectfiles\VC14\wesnoth.sln /property:PlatformToolset=v141 /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" artifacts: - path: wesnoth.exe diff --git a/projectfiles/VC12/README.md b/projectfiles/VC14/README.md similarity index 100% rename from projectfiles/VC12/README.md rename to projectfiles/VC14/README.md diff --git a/projectfiles/VC12/WML_tests.cmd b/projectfiles/VC14/WML_tests.cmd similarity index 100% rename from projectfiles/VC12/WML_tests.cmd rename to projectfiles/VC14/WML_tests.cmd diff --git a/projectfiles/VC12/WindowsTimeout.cpp b/projectfiles/VC14/WindowsTimeout.cpp similarity index 100% rename from projectfiles/VC12/WindowsTimeout.cpp rename to projectfiles/VC14/WindowsTimeout.cpp diff --git a/projectfiles/VC12/WindowsTimeout.vcxproj b/projectfiles/VC14/WindowsTimeout.vcxproj similarity index 94% rename from projectfiles/VC12/WindowsTimeout.vcxproj rename to projectfiles/VC14/WindowsTimeout.vcxproj index f2fce5039b88..d38ca390d2d5 100644 --- a/projectfiles/VC12/WindowsTimeout.vcxproj +++ b/projectfiles/VC14/WindowsTimeout.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,13 +18,13 @@ Application - v120 + v140 MultiByte true Application - v120 + v140 MultiByte @@ -62,7 +62,7 @@ /SAFESEH:NO %(AdditionalOptions) $(OutDir)WindowsTimeout.exe - true + DebugFastLink $(IntDir)$(TargetName).pdb Console MachineX86 diff --git a/projectfiles/VC12/campaignd.vcxproj b/projectfiles/VC14/campaignd.vcxproj similarity index 95% rename from projectfiles/VC12/campaignd.vcxproj rename to projectfiles/VC14/campaignd.vcxproj index 84da5b0861fc..80e1ab4ec4d2 100644 --- a/projectfiles/VC12/campaignd.vcxproj +++ b/projectfiles/VC14/campaignd.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,13 +18,13 @@ Application true - v120 + v140 NotSet Application false - v120 + v140 true NotSet @@ -51,7 +51,7 @@ 4244 - true + DebugFastLink ..\..\..\external\lib Shlwapi.lib;libeay32.lib;%(AdditionalDependencies) @@ -68,7 +68,7 @@ 4244 - true + DebugFastLink true true ..\..\..\external\lib diff --git a/projectfiles/VC12/campaignd.vcxproj.filters b/projectfiles/VC14/campaignd.vcxproj.filters similarity index 100% rename from projectfiles/VC12/campaignd.vcxproj.filters rename to projectfiles/VC14/campaignd.vcxproj.filters diff --git a/projectfiles/VC12/files_with_deactivated_warnings.txt b/projectfiles/VC14/files_with_deactivated_warnings.txt similarity index 100% rename from projectfiles/VC12/files_with_deactivated_warnings.txt rename to projectfiles/VC14/files_with_deactivated_warnings.txt diff --git a/projectfiles/VC12/liblua.vcxproj b/projectfiles/VC14/liblua.vcxproj similarity index 97% rename from projectfiles/VC12/liblua.vcxproj rename to projectfiles/VC14/liblua.vcxproj index 12d1acdf1020..516f6e051239 100644 --- a/projectfiles/VC12/liblua.vcxproj +++ b/projectfiles/VC14/liblua.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,19 +22,19 @@ StaticLibrary - v120 + v140 Unicode true StaticLibrary - v120 + v140 Unicode true StaticLibrary - v120 + v140 Unicode diff --git a/projectfiles/VC12/liblua.vcxproj.filters b/projectfiles/VC14/liblua.vcxproj.filters similarity index 100% rename from projectfiles/VC12/liblua.vcxproj.filters rename to projectfiles/VC14/liblua.vcxproj.filters diff --git a/projectfiles/VC12/wesnoth.sln b/projectfiles/VC14/wesnoth.sln similarity index 100% rename from projectfiles/VC12/wesnoth.sln rename to projectfiles/VC14/wesnoth.sln diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC14/wesnoth.vcxproj similarity index 99% rename from projectfiles/VC12/wesnoth.vcxproj rename to projectfiles/VC14/wesnoth.vcxproj index 0447d07e2ea8..ba8bce02529f 100644 --- a/projectfiles/VC12/wesnoth.vcxproj +++ b/projectfiles/VC14/wesnoth.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -30,30 +30,30 @@ Application - v120 + v140 NotSet true Application - v120 + v140 NotSet true Application - v120 + v140 NotSet Application - v120 + v140 NotSet true Application - v120 + v140 NotSet @@ -140,7 +140,7 @@ SDL2main.lib;SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;libeay32.lib;cairo.lib;winmm.lib;ws2_32.lib;pango-1.0.lib;pangocairo-1.0.lib;gobject-2.0.lib;glib-2.0.lib;libpng.lib;$(IntDir)liblua.lib;Shlwapi.lib;%(AdditionalDependencies) ..\..\..\external\lib;%(AdditionalLibraryDirectories) MSVCR90;MSVCRT;%(IgnoreSpecificDefaultLibraries) - true + DebugFastLink Windows MachineX86 @@ -183,7 +183,7 @@ Windows true true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration MachineX86 @@ -221,7 +221,7 @@ SDL2main.lib;SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;libeay32.lib;cairo.lib;winmm.lib;ws2_32.lib;pango-1.0.lib;pangocairo-1.0.lib;gobject-2.0.lib;glib-2.0.lib;libpng.lib;Debug\liblua.lib;Shlwapi.lib;%(AdditionalDependencies) $(OutDir)test.exe ..\..\..\external\lib;%(AdditionalLibraryDirectories) - true + DebugFastLink Console MachineX86 @@ -265,7 +265,7 @@ Console true true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration MachineX86 @@ -307,11 +307,11 @@ SDL2main.lib;SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;libeay32.lib;cairo.lib;winmm.lib;ws2_32.lib;pango-1.0.lib;pangocairo-1.0.lib;gobject-2.0.lib;glib-2.0.lib;libpng.lib;$(IntDir)liblua.lib;Shlwapi.lib;%(AdditionalDependencies) ..\..\..\external\lib;%(AdditionalLibraryDirectories) - true + DebugFastLink Windows true true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration MachineX86 diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC14/wesnoth.vcxproj.filters similarity index 100% rename from projectfiles/VC12/wesnoth.vcxproj.filters rename to projectfiles/VC14/wesnoth.vcxproj.filters diff --git a/projectfiles/VC12/wesnothd.vcxproj b/projectfiles/VC14/wesnothd.vcxproj similarity index 96% rename from projectfiles/VC12/wesnothd.vcxproj rename to projectfiles/VC14/wesnothd.vcxproj index 20edfe4bb1fa..66d8614ae8f0 100644 --- a/projectfiles/VC12/wesnothd.vcxproj +++ b/projectfiles/VC14/wesnothd.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,19 +22,19 @@ Application - v120 + v140 NotSet true Application - v120 + v140 NotSet true Application - v120 + v140 NotSet @@ -99,7 +99,7 @@ /SAFESEH:NO %(AdditionalOptions) winmm.lib;ws2_32.lib;Shlwapi.lib;libeay32.lib;%(AdditionalDependencies) ..\..\..\external\lib;%(AdditionalLibraryDirectories) - true + DebugFastLink Console MachineX86 @@ -128,7 +128,7 @@ Console true true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration MachineX86 @@ -152,11 +152,11 @@ winmm.lib;ws2_32.lib;Shlwapi.lib;libeay32.lib;%(AdditionalDependencies) ..\..\..\external\lib;%(AdditionalLibraryDirectories) - true + DebugFastLink Console true true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration MachineX86 diff --git a/projectfiles/VC12/wesnothd.vcxproj.filters b/projectfiles/VC14/wesnothd.vcxproj.filters similarity index 100% rename from projectfiles/VC12/wesnothd.vcxproj.filters rename to projectfiles/VC14/wesnothd.vcxproj.filters diff --git a/projectfiles/VC12/wesnothlib.vcxproj b/projectfiles/VC14/wesnothlib.vcxproj similarity index 98% rename from projectfiles/VC12/wesnothlib.vcxproj rename to projectfiles/VC14/wesnothlib.vcxproj index b0bf0e672898..f9fec160ce65 100644 --- a/projectfiles/VC12/wesnothlib.vcxproj +++ b/projectfiles/VC14/wesnothlib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,19 +21,19 @@ StaticLibrary - v120 + v140 MultiByte true StaticLibrary - v120 + v140 MultiByte true StaticLibrary - v120 + v140 MultiByte diff --git a/projectfiles/VC12/wesnothlib.vcxproj.filters b/projectfiles/VC14/wesnothlib.vcxproj.filters similarity index 100% rename from projectfiles/VC12/wesnothlib.vcxproj.filters rename to projectfiles/VC14/wesnothlib.vcxproj.filters