diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index bd20119c..8dfb0188 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -2558,7 +2558,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2587,7 +2587,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MKXPZ_EXECUTABLE_NAME = shim; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -2636,7 +2636,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2663,7 +2663,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MKXPZ_EXECUTABLE_NAME = shim; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -2848,7 +2848,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2873,7 +2873,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -2920,7 +2920,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2943,7 +2943,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -2988,7 +2988,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3026,7 +3026,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3072,7 +3072,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3108,7 +3108,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -3153,7 +3153,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3178,7 +3178,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3224,7 +3224,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.1.2; + CURRENT_PROJECT_VERSION = 2.2.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3247,7 +3247,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.1.2; + MARKETING_VERSION = 2.2.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; diff --git a/meson.build b/meson.build index 4d8451d3..5dd59a8f 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('mkxp-z', 'c', 'cpp', version: '2.1.2', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release']) +project('mkxp-z', 'c', 'cpp', version: '2.2.0', 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 ecfdad5a..1c28728d 100644 --- a/windows/resource.rc +++ b/windows/resource.rc @@ -11,10 +11,10 @@ BLOCK "StringFileInfo" { BLOCK "040904b0" { -VALUE "FileVersion", "2.1.2\0" +VALUE "FileVersion", "2.2.0\0" VALUE "OriginalFilename", "mkxp-z.exe\0" VALUE "ProductName", "mkxp-z\0" -VALUE "ProductVersion", "2.1.2\0" +VALUE "ProductVersion", "2.2.0\0" } } BLOCK "VarFileInfo"