bump version to 2.4.2

This commit is contained in:
Struma 2023-05-04 16:42:31 -04:00
parent e5cf1f4777
commit 10cdc672dd
4 changed files with 23 additions and 23 deletions

View file

@ -82,7 +82,7 @@ jobs:
- uses: benjlevesque/short-sha@v2.2
id: short-sha
with:
length: 6
length: 7
- name: Checkout repository
uses: actions/checkout@v3
@ -129,7 +129,7 @@ jobs:
- uses: benjlevesque/short-sha@v2.2
id: short-sha
with:
length: 6
length: 7
- name: Checkout repository
uses: actions/checkout@v3

View file

@ -2632,7 +2632,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2660,7 +2660,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@ -2707,7 +2707,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2733,7 +2733,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -2915,7 +2915,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2957,7 +2957,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@ -3004,7 +3004,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3044,7 +3044,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -3092,7 +3092,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3130,7 +3130,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
@ -3175,7 +3175,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3211,7 +3211,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
@ -3256,7 +3256,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3280,7 +3280,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
@ -3325,7 +3325,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.4.1;
CURRENT_PROJECT_VERSION = 2.4.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3347,7 +3347,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.4.1;
MARKETING_VERSION = 2.4.2;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";

View file

@ -1,4 +1,4 @@
project('mkxp-z', 'c', 'cpp', version: '2.4.1', meson_version: '>=0.56.0', default_options: ['cpp_std=c++14', 'buildtype=release'])
project('mkxp-z', 'c', 'cpp', version: '2.4.2', meson_version: '>=0.56.0', default_options: ['cpp_std=c++14', 'buildtype=release'])
host_system = host_machine.system()

View file

@ -6,17 +6,17 @@ IDI_APPICON ICON "icon.ico"
IDI_MANIFEST RT_MANIFEST "mkxpz.manifest"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,1,0
PRODUCTVERSION 2,4,1,0
FILEVERSION 2,4,2,0
PRODUCTVERSION 2,4,2,0
{
BLOCK "StringFileInfo"
{
BLOCK "040904b0"
{
VALUE "FileVersion", "2.4.1\0"
VALUE "FileVersion", "2.4.2\0"
VALUE "OriginalFilename", "mkxp-z.exe\0"
VALUE "ProductName", "mkxp-z\0"
VALUE "ProductVersion", "2.4.1\0"
VALUE "ProductVersion", "2.4.2\0"
}
}
BLOCK "VarFileInfo"