mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-04-22 06:02:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump version to 2.2.2

Browse source
This commit is contained in:
Struma 2021-06-25 22:35:54 -04:00 • committed by Roza
parent 20878a4d70
commit 7400b42bea
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
macos/mkxp-z.xcodeproj/project.pbxproj
View file

@ -2570,7 +2570,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -2599,7 +2599,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MKXPZ_EXECUTABLE_NAME = shim; MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
@ -2648,7 +2648,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -2675,7 +2675,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MKXPZ_EXECUTABLE_NAME = shim; MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
@ -2860,7 +2860,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -2886,7 +2886,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@ -2933,7 +2933,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -2957,7 +2957,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-arm64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
@ -3002,7 +3002,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -3041,7 +3041,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@ -3087,7 +3087,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -3124,7 +3124,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
@ -3169,7 +3169,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -3194,7 +3194,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@ -3240,7 +3240,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.1; CURRENT_PROJECT_VERSION = 2.2.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@ -3263,7 +3263,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE", "$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib", "$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
); );
MARKETING_VERSION = 2.2.1; MARKETING_VERSION = 2.2.2;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";

2
meson.build
View file

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

2
src/meson.build
View file

@ -4,7 +4,7 @@ vorbisfile = dependency('vorbisfile', static: build_static)
vorbis = dependency('vorbis', static: build_static) vorbis = dependency('vorbis', static: build_static)
ogg = dependency('ogg', static: build_static) ogg = dependency('ogg', static: build_static)
sdl2 = dependency('SDL2', static: build_static) sdl2 = dependency('SDL2', static: build_static)
sdl_sound = dependency('SDL_sound', static: build_static) sdl_sound = compilers['cpp'].find_library('SDL2_sound')
sdl2_ttf = dependency('SDL2_ttf', static: build_static) sdl2_ttf = dependency('SDL2_ttf', static: build_static)
freetype = dependency('freetype2', static: build_static) freetype = dependency('freetype2', static: build_static)
sdl2_image = dependency('SDL2_image', static: build_static) sdl2_image = dependency('SDL2_image', static: build_static)

8
windows/resource.rc
View file

@ -4,17 +4,17 @@
IDI_APPICON ICON "icon.ico" IDI_APPICON ICON "icon.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,1,0 FILEVERSION 2,2,2,0
PRODUCTVERSION 2,2,1,0 PRODUCTVERSION 2,2,2,0
{ {
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
{ {
BLOCK "040904b0" BLOCK "040904b0"
{ {
VALUE "FileVersion", "2.2.1\0" VALUE "FileVersion", "2.2.2\0"
VALUE "OriginalFilename", "mkxp-z.exe\0" VALUE "OriginalFilename", "mkxp-z.exe\0"
VALUE "ProductName", "mkxp-z\0" VALUE "ProductName", "mkxp-z\0"
VALUE "ProductVersion", "2.2.1\0" VALUE "ProductVersion", "2.2.2\0"
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"