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

bump version to 2.3

Browse source
This commit is contained in:
Struma 2022-01-13 15:40:40 -05:00
parent 385060094c
commit 231f80cac5
7 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linux/Makefile
View file

@ -312,9 +312,9 @@ $(DOWNLOADS)/openssl/Configure:
$(CLONE) $(GITHUB)/openssl/openssl $(DOWNLOADS)/openssl -c advice.detachedHead=false --branch OpenSSL_1_1_1i
# Standard ruby
ruby: init_dirs openssl $(BUILD_PREFIX)/libruby.so.3.0
ruby: init_dirs openssl $(BUILD_PREFIX)/libruby.so.3.1
$(BUILD_PREFIX)/libruby.so.3.0: $(DOWNLOADS)/ruby/Makefile
$(BUILD_PREFIX)/libruby.so.3.1: $(DOWNLOADS)/ruby/Makefile
cd $(DOWNLOADS)/ruby; \
make -j$(NPROC); make install

7
macos/Dependencies/dependencies.make
View file

@ -298,13 +298,12 @@ $(DOWNLOADS)/openssl/Configure:
cd $(DOWNLOADS)/openssl; git checkout OpenSSL_1_1_1i
# Standard ruby
ruby: init_dirs openssl $(LIBDIR)/libruby.3.0.dylib
ruby: init_dirs openssl $(LIBDIR)/libruby.3.1.dylib
$(LIBDIR)/libruby.3.0.dylib: $(DOWNLOADS)/ruby/Makefile
$(LIBDIR)/libruby.3.1.dylib: $(DOWNLOADS)/ruby/Makefile
cd $(DOWNLOADS)/ruby; \
$(CONFIGURE_ENV) make -j$(NPROC); $(CONFIGURE_ENV) make install
# Make the dylib relative
install_name_tool -id @rpath/libruby.3.0.dylib $(LIBDIR)/libruby.3.0.dylib
install_name_tool -id @rpath/libruby.3.1.dylib $(LIBDIR)/libruby.3.1.dylib
$(DOWNLOADS)/ruby/Makefile: $(DOWNLOADS)/ruby/configure
cd $(DOWNLOADS)/ruby; \

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

@ -220,9 +220,9 @@
3B1C242025A1A8660075EF5D /* libsteam_api.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B1C241125A1A7120075EF5D /* libsteam_api.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B1C242625A1A90B0075EF5D /* shim in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B1C235625A199370075EF5D /* shim */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B1C242B25A1AA1F0075EF5D /* steamshim_child.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B1C236925A19B960075EF5D /* steamshim_child.c */; };
3B251DA626DA2CFA00E5D09B /* 3.0.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.0.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B251DA826DA2E9000E5D09B /* 3.0.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.0.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B251DAC26DA2EC200E5D09B /* 3.0.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.0.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B251DA626DA2CFA00E5D09B /* 3.1.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.1.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B251DA826DA2E9000E5D09B /* 3.1.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.1.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B251DAC26DA2EC200E5D09B /* 3.1.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.1.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3B312843259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; };
3B312844259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; };
3B3F7D1D25B19F6E00EA5F1C /* settingsmenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3B3F7D1725B19DEC00EA5F1C /* settingsmenu.xib */; };
@ -368,7 +368,7 @@
3BBE87FA2705A73400A574AE /* Assets.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BA08EA4256641ED00449CFF /* Assets.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3BBE87FB2705A73400A574AE /* steam_appid.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B1C243E25A1B8D20075EF5D /* steam_appid.txt */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3BBE87FD2705A73400A574AE /* mkxp.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3BD2B7282565B35D003DAD8A /* mkxp.json */; };
3BBE87FF2705A73400A574AE /* 3.0.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.0.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3BBE87FF2705A73400A574AE /* 3.1.0 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B251DA526DA2CFA00E5D09B /* 3.1.0 */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3BBE88012705A73400A574AE /* libfluidsynth.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3BBE88022705A73400A574AE /* libEGL.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5E1F0925A881FB0086FFDC /* libEGL.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3BBE88042705A73400A574AE /* libsteam_api.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B1C241125A1A7120075EF5D /* libsteam_api.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@ -635,7 +635,7 @@
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DA626DA2CFA00E5D09B /* 3.0.0 in CopyFiles */,
3B251DA626DA2CFA00E5D09B /* 3.1.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -645,7 +645,7 @@
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DA826DA2E9000E5D09B /* 3.0.0 in CopyFiles */,
3B251DA826DA2E9000E5D09B /* 3.1.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -655,7 +655,7 @@
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DAC26DA2EC200E5D09B /* 3.0.0 in CopyFiles */,
3B251DAC26DA2EC200E5D09B /* 3.1.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -778,7 +778,7 @@
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3BBE87FF2705A73400A574AE /* 3.0.0 in CopyFiles */,
3BBE87FF2705A73400A574AE /* 3.1.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -989,7 +989,7 @@
3B1C240C25A1A4C50075EF5D /* steamshim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = steamshim.xcconfig; path = config/steamshim.xcconfig; sourceTree = "<group>"; };
3B1C241125A1A7120075EF5D /* libsteam_api.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsteam_api.dylib; path = Dependencies/Frameworks/steam/sdk/redistributable_bin/osx/libsteam_api.dylib; sourceTree = "<group>"; };
3B1C243E25A1B8D20075EF5D /* steam_appid.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = steam_appid.txt; path = config/steam_appid.txt; sourceTree = "<group>"; };
3B251DA526DA2CFA00E5D09B /* 3.0.0 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = 3.0.0; path = "Dependencies/build-macosx-x86_64/lib/ruby/3.0.0"; sourceTree = "<group>"; };
3B251DA526DA2CFA00E5D09B /* 3.1.0 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = 3.1.0; path = "Dependencies/build-macosx-x86_64/lib/ruby/3.1.0"; sourceTree = "<group>"; };
3B312841259E7DC1002EAB43 /* miniffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = miniffi.h; sourceTree = "<group>"; };
3B312842259E7DC1002EAB43 /* miniffi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = miniffi.cpp; sourceTree = "<group>"; };
3B3F7D1725B19DEC00EA5F1C /* settingsmenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = settingsmenu.xib; path = views/settingsmenu.xib; sourceTree = "<group>"; };
@ -1623,7 +1623,7 @@
3B251DA226DA2C8600E5D09B /* Ruby Standard Library */ = {
isa = PBXGroup;
children = (
3B251DA526DA2CFA00E5D09B /* 3.0.0 */,
3B251DA526DA2CFA00E5D09B /* 3.1.0 */,
);
name = "Ruby Standard Library";
sourceTree = "<group>";
@ -2633,7 +2633,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2661,7 +2661,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@ -2709,7 +2709,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2735,7 +2735,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -2917,7 +2917,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -2959,7 +2959,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@ -3007,7 +3007,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3047,7 +3047,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MKXPZ_EXECUTABLE_NAME = shim;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -3095,7 +3095,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3133,7 +3133,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -3179,7 +3179,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3215,7 +3215,7 @@
"$(PROJECT_DIR)/Dependencies/build-macosx-universal/lib",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";
@ -3260,7 +3260,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3284,7 +3284,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -3330,7 +3330,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2.3;
CURRENT_PROJECT_VERSION = 2.3.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
ENABLE_HARDENED_RUNTIME = NO;
@ -3352,7 +3352,7 @@
"$(PROJECT_DIR)/Dependencies/Frameworks/ANGLE",
"$(PROJECT_DIR)/Dependencies/build-macosx-x86_64/lib",
);
MARKETING_VERSION = 2.2.3;
MARKETING_VERSION = 2.3.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "";

8
macos/views/settingsmenu.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -31,9 +31,9 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WK9-Dx-OSG">
<rect key="frame" x="18" y="271" width="503" height="16"/>
<rect key="frame" x="18" y="271" width="589" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Select a binding. Click an empty slot to bind a key, and click a full slot to remove it." id="bx4-Ww-Wm4">
<textFieldCell key="cell" lineBreakMode="clipping" title="Select a binding. Click an empty slot to bind an action, and click a full slot to remove the binding." id="bx4-Ww-Wm4">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

2
meson.build
View file

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

4
windows/Makefile
View file

@ -295,9 +295,9 @@ $(DOWNLOADS)/openssl/Configure:
$(CLONE) $(GITHUB)/openssl/openssl $(DOWNLOADS)/openssl -c advice.detachedHead=false --branch OpenSSL_1_1_1i
# Standard ruby
ruby: init_dirs openssl $(BUILD_PREFIX)/$(RB_PREFIX)-ruby300.dll
ruby: init_dirs openssl $(BUILD_PREFIX)/$(RB_PREFIX)-ruby310.dll
$(BUILD_PREFIX)/$(RB_PREFIX)-ruby300.dll: $(DOWNLOADS)/ruby/Makefile
$(BUILD_PREFIX)/$(RB_PREFIX)-ruby310.dll: $(DOWNLOADS)/ruby/Makefile
cd $(DOWNLOADS)/ruby; \
make -j$(NPROC); make install

8
windows/resource.rc
View file

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