diff --git a/macos/config/mkxp.xcconfig b/macos/config/mkxp.xcconfig index 1c0d24ff..71906faf 100644 --- a/macos/config/mkxp.xcconfig +++ b/macos/config/mkxp.xcconfig @@ -5,7 +5,7 @@ // // Uncomment for Essentials crap -MKXPZ_EXTRA_ARGS = MKXPZ_ESSENTIALS_DEBUG +// MKXPZ_EXTRA_ARGS = MKXPZ_ESSENTIALS_DEBUG // ----------------------------- // Don't change any of this diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index c89a9ce2..3c0b715d 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -2539,7 +2539,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2568,7 +2568,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MKXPZ_EXECUTABLE_NAME = shim; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -2618,7 +2618,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2645,7 +2645,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MKXPZ_EXECUTABLE_NAME = shim; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -2831,7 +2831,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2856,7 +2856,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -2904,7 +2904,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -2927,7 +2927,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -2973,7 +2973,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3011,7 +3011,7 @@ "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3058,7 +3058,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3094,7 +3094,7 @@ "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -3140,7 +3140,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3165,7 +3165,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3212,7 +3212,7 @@ CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/entitlements.plist"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.0; + CURRENT_PROJECT_VERSION = 2.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; ENABLE_HARDENED_RUNTIME = YES; @@ -3235,7 +3235,7 @@ "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; diff --git a/meson.build b/meson.build index 21b1310a..9b4308f2 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('mkxp-z', 'c', 'cpp', version: '2.0.0', meson_version: '>=0.47.0', default_options: ['cpp_std=c++11', 'buildtype=release']) +project('mkxp-z', 'c', 'cpp', version: '2.1.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 b8241f5a..67c80bc0 100644 --- a/windows/resource.rc +++ b/windows/resource.rc @@ -4,17 +4,17 @@ IDI_APPICON ICON "icon.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,0,0,0 -PRODUCTVERSION 2,0,0,0 +FILEVERSION 2,1,0,0 +PRODUCTVERSION 2,1,0,0 { BLOCK "StringFileInfo" { BLOCK "040904b0" { -VALUE "FileVersion", "2.0.0\0" +VALUE "FileVersion", "2.1.0\0" VALUE "OriginalFilename", "mkxp-z.exe\0" VALUE "ProductName", "mkxp-z\0" -VALUE "ProductVersion", "2.0.0\0" +VALUE "ProductVersion", "2.1.0\0" } } BLOCK "VarFileInfo"