diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f00f2b0..7f074ca3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -258,63 +258,6 @@ VS2015-32-bit-static-no-apps: paths: - build-release/*.exe - -VS2013-64-bit-shared-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2013" - ARCHITECTURE: "x64" - SHARED: "TRUE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2013 - artifacts: - paths: - - build-release/*.exe - -VS2013-32-bit-shared-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2013" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2013 - artifacts: - paths: - - build-release/*.exe - -VS2013-64-bit-static-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2013" - ARCHITECTURE: "x64" - SHARED: "FALSE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2013 - artifacts: - paths: - - build-release/*.exe - -VS2013-32-bit-static-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2013" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2013 - artifacts: - paths: - - build-release/*.exe - Doc-publish: stage: deploy only: diff --git a/CI/Windows.bat b/CI/Windows.bat index b2a0c2f4..d4f44307 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -16,21 +16,6 @@ IF "%SHARED%" == "TRUE" ( set STRING_DLL= ) -IF "%BUILD_PLATFORM%" == "VS2013" ( - set LIBPATH=E:\libs\VS2013 - set GTESTVERSION=gtest-1.6.0 - set GENERATOR=Visual Studio 12%ARCH_VS% - set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com" - IF "%ARCHITECTURE%" == "x64" ( - set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64 - ) - - IF "%ARCHITECTURE%" == "x32" ( - set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013 - ) -) IF "%BUILD_PLATFORM%" == "VS2015" ( set LIBPATH=E:\libs\VS2015