From 0ee00d11377bee8ec43cea2b50b28a43daefe0ec Mon Sep 17 00:00:00 2001 From: Struma Date: Fri, 30 Apr 2021 14:47:37 -0400 Subject: [PATCH] version bump to 2.1.2 --- macos/mkxp-z.xcodeproj/project.pbxproj | 32 +++++++++++++------------- meson.build | 2 +- windows/resource.rc | 8 +++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index ceff8180..e74c81fe 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -2520,7 +2520,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2549,7 +2549,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1; + MARKETING_VERSION = 2.1.2; MKXPZ_EXECUTABLE_NAME = shim; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -2598,7 +2598,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2625,7 +2625,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1; + MARKETING_VERSION = 2.1.2; MKXPZ_EXECUTABLE_NAME = shim; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -2810,7 +2810,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2835,7 +2835,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", ); - MARKETING_VERSION = 2.1; + MARKETING_VERSION = 2.1.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -2882,7 +2882,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2905,7 +2905,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", ); - MARKETING_VERSION = 2.1; + MARKETING_VERSION = 2.1.2; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -2950,7 +2950,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2988,7 +2988,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", ); - MARKETING_VERSION = 2.1.1; + MARKETING_VERSION = 2.1.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3034,7 +3034,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3070,7 +3070,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", ); - MARKETING_VERSION = 2.1.1; + MARKETING_VERSION = 2.1.2; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -3115,7 +3115,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3140,7 +3140,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1; + MARKETING_VERSION = 2.1.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3186,7 +3186,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1; + CURRENT_PROJECT_VERSION = 2.1.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3209,7 +3209,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1; + MARKETING_VERSION = 2.1.2; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; diff --git a/meson.build b/meson.build index 182bda32..4d8451d3 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('mkxp-z', 'c', 'cpp', version: '2.1.1', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release']) +project('mkxp-z', 'c', 'cpp', version: '2.1.2', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release']) host_system = host_machine.system() diff --git a/windows/resource.rc b/windows/resource.rc index 4cb5d693..ecfdad5a 100644 --- a/windows/resource.rc +++ b/windows/resource.rc @@ -4,17 +4,17 @@ IDI_APPICON ICON "icon.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,1,1,0 -PRODUCTVERSION 2,1,1,0 +FILEVERSION 2,1,2,0 +PRODUCTVERSION 2,1,2,0 { BLOCK "StringFileInfo" { BLOCK "040904b0" { -VALUE "FileVersion", "2.1.1\0" +VALUE "FileVersion", "2.1.2\0" VALUE "OriginalFilename", "mkxp-z.exe\0" VALUE "ProductName", "mkxp-z\0" -VALUE "ProductVersion", "2.1.1\0" +VALUE "ProductVersion", "2.1.2\0" } } BLOCK "VarFileInfo"