diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7414c1d..75ed8497 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -342,22 +342,6 @@ VS2017-64-bit-shared-no-apps: paths: - build-release/*.exe - -VS2017-32-bit-shared-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2017" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2017 - artifacts: - paths: - - build-release/*.exe - - VS2017-64-bit-static-no-apps: stage: build variables: @@ -372,21 +356,6 @@ VS2017-64-bit-static-no-apps: paths: - build-release/*.exe - -VS2017-32-bit-static-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2017" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2017 - artifacts: - paths: - - build-release/*.exe - VS2015-64-bit-shared-apps: stage: build variables: @@ -416,34 +385,6 @@ VS2015-64-bit-shared-no-apps: paths: - build-release/*.exe -VS2015-32-bit-shared-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "ON" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - -VS2015-32-bit-shared-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - VS2015-64-bit-static-apps: stage: build variables: @@ -472,34 +413,6 @@ VS2015-64-bit-static-no-apps: paths: - build-release/*.exe -VS2015-32-bit-static-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "ON" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - -VS2015-32-bit-static-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - Doc-publish: stage: deploy only: diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml index d8ebdf03..5577eaf7 100644 --- a/CI/gitlab-ci/windows.yml +++ b/CI/gitlab-ci/windows.yml @@ -47,22 +47,6 @@ VS2017-64-bit-shared-no-apps: paths: - build-release/*.exe - -VS2017-32-bit-shared-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2017" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2017 - artifacts: - paths: - - build-release/*.exe - - VS2017-64-bit-static-no-apps: stage: build variables: @@ -77,21 +61,6 @@ VS2017-64-bit-static-no-apps: paths: - build-release/*.exe - -VS2017-32-bit-static-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2017" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2017 - artifacts: - paths: - - build-release/*.exe - VS2015-64-bit-shared-apps: stage: build variables: @@ -121,34 +90,6 @@ VS2015-64-bit-shared-no-apps: paths: - build-release/*.exe -VS2015-32-bit-shared-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "ON" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - -VS2015-32-bit-shared-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "TRUE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - VS2015-64-bit-static-apps: stage: build variables: @@ -176,31 +117,3 @@ VS2015-64-bit-static-no-apps: artifacts: paths: - build-release/*.exe - -VS2015-32-bit-static-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "ON" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - -VS2015-32-bit-static-no-apps: - stage: build - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - SHARED: "FALSE" - APPS: "OFF" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 01064595..4e4e742e 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -6,6 +6,22 @@ + +9.0 (?/?/?) + +Breaking Changes + + +Build System + + + + + 8.1 (2020/04/23) Breaking Changes diff --git a/VERSION b/VERSION index b81fb1ea..77582fff 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=8.1 -MAJOR=8 -MINOR=1 +VERSION=9.0 +MAJOR=9 +MINOR=0 PATCH=0 ID=OPENMESH diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index adba98ec..9d09ade6 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -65,7 +65,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x80100 +#define OM_VERSION 0x90000 //#define OM_VERSION 0x70200 #define OM_GET_VER ((OM_VERSION & 0xf0000) >> 16)