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

Include Ruby standard library by default on macOS

Browse source
This commit is contained in:
Struma 2021-08-28 04:53:04 -04:00 • committed by Roza
parent 8b0bb010ba
commit e9fdf46d49
4 changed files with 72 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
binding/binding-mri.cpp
View file

@ -1128,6 +1128,14 @@ static void mriBindingExecute() {
rb_funcall(rbArgv, rb_intern("uniq!"), 0); rb_funcall(rbArgv, rb_intern("uniq!"), 0);
VALUE lpaths = rb_gv_get(":"); VALUE lpaths = rb_gv_get(":");
rb_ary_clear(lpaths);
#if defined(MKXPZ_BUILD_XCODE) && RAPI_MAJOR >= 2
std::string resPath = mkxp_fs::getResourcePath();
resPath += "/Ruby/" + std::to_string(RAPI_MAJOR) + "." + std::to_string(RAPI_MINOR) + ".0";
rb_ary_push(lpaths, rb_str_new(resPath.c_str(), resPath.size()));
#endif
if (!conf.rubyLoadpaths.empty()) { if (!conf.rubyLoadpaths.empty()) {
/* Setup custom load paths */ /* Setup custom load paths */
for (size_t i = 0; i < conf.rubyLoadpaths.size(); ++i) { for (size_t i = 0; i < conf.rubyLoadpaths.size(); ++i) {

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

@ -228,6 +228,10 @@
3B1C242625A1A90B0075EF5D /* shim in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B1C235625A199370075EF5D /* shim */; 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 */; }; 3B1C242B25A1AA1F0075EF5D /* steamshim_child.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B1C236925A19B960075EF5D /* steamshim_child.c */; };
3B1C244425A1BD220075EF5D /* steam_appid.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B1C243E25A1B8D20075EF5D /* steam_appid.txt */; }; 3B1C244425A1BD220075EF5D /* steam_appid.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3B1C243E25A1B8D20075EF5D /* steam_appid.txt */; };
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, ); }; };
3B251DAA26DA2EAB00E5D09B /* 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, ); }; };
3B312843259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; }; 3B312843259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; };
3B312844259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; }; 3B312844259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; };
3B312845259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; }; 3B312845259E7DC1002EAB43 /* miniffi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B312842259E7DC1002EAB43 /* miniffi.cpp */; };
@ -638,6 +642,46 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
3B251D9F26DA2C2A00E5D09B /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DA626DA2CFA00E5D09B /* 3.0.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3B251DA726DA2E8A00E5D09B /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DA826DA2E9000E5D09B /* 3.0.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3B251DA926DA2EA400E5D09B /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DAA26DA2EAB00E5D09B /* 3.0.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3B251DAB26DA2EBB00E5D09B /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = Ruby;
dstSubfolderSpec = 7;
files = (
3B251DAC26DA2EC200E5D09B /* 3.0.0 in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3B522D79259BA0E3003301C4 /* Embed Frameworks */ = { 3B522D79259BA0E3003301C4 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase; isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -937,6 +981,7 @@
3B1C240C25A1A4C50075EF5D /* steamshim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = steamshim.xcconfig; path = config/steamshim.xcconfig; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; };
3B312841259E7DC1002EAB43 /* miniffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = miniffi.h; 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>"; }; 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>"; }; 3B3F7D1725B19DEC00EA5F1C /* settingsmenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = settingsmenu.xib; path = views/settingsmenu.xib; sourceTree = "<group>"; };
@ -1573,6 +1618,14 @@
name = Steam; name = Steam;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
3B251DA226DA2C8600E5D09B /* Ruby Standard Library */ = {
isa = PBXGroup;
children = (
3B251DA526DA2CFA00E5D09B /* 3.0.0 */,
);
name = "Ruby Standard Library";
sourceTree = "<group>";
};
3B3F7D1325B19C5A00EA5F1C /* MacOS */ = { 3B3F7D1325B19C5A00EA5F1C /* MacOS */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -1739,6 +1792,7 @@
3BDB22EB25644FBF00C4A63D = { 3BDB22EB25644FBF00C4A63D = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
3B251DA226DA2C8600E5D09B /* Ruby Standard Library */,
3B1BC0E5266F8E2A00794D22 /* Makefiles */, 3B1BC0E5266F8E2A00794D22 /* Makefiles */,
3BD2B7272565B343003DAD8A /* README.md */, 3BD2B7272565B343003DAD8A /* README.md */,
3BDB23E22564546E00C4A63D /* icon.icns */, 3BDB23E22564546E00C4A63D /* icon.icns */,
@ -1852,6 +1906,7 @@
3B1C242525A1A8F00075EF5D /* CopyFiles */, 3B1C242525A1A8F00075EF5D /* CopyFiles */,
3B1C23E825A19C600075EF5D /* CopyFiles */, 3B1C23E825A19C600075EF5D /* CopyFiles */,
3B1C23EA25A19C600075EF5D /* CopyFiles */, 3B1C23EA25A19C600075EF5D /* CopyFiles */,
3B251DAB26DA2EBB00E5D09B /* CopyFiles */,
3B1C23EC25A19C600075EF5D /* Embed Frameworks */, 3B1C23EC25A19C600075EF5D /* Embed Frameworks */,
3B1C244325A1BD1D0075EF5D /* CopyFiles */, 3B1C244325A1BD1D0075EF5D /* CopyFiles */,
); );
@ -1894,6 +1949,7 @@
3BC65D3C2584EDC60063AFF1 /* Resources */, 3BC65D3C2584EDC60063AFF1 /* Resources */,
3B1C233B25A17CBE0075EF5D /* CopyFiles */, 3B1C233B25A17CBE0075EF5D /* CopyFiles */,
3BC65D3E2584EDC60063AFF1 /* CopyFiles */, 3BC65D3E2584EDC60063AFF1 /* CopyFiles */,
3B251DA926DA2EA400E5D09B /* CopyFiles */,
3B522D7F259BA0EC003301C4 /* Embed Frameworks */, 3B522D7F259BA0EC003301C4 /* Embed Frameworks */,
); );
buildRules = ( buildRules = (
@ -1915,6 +1971,7 @@
3BC65E0D2584F3AD0063AFF1 /* Resources */, 3BC65E0D2584F3AD0063AFF1 /* Resources */,
3B1C233325A17C380075EF5D /* CopyFiles */, 3B1C233325A17C380075EF5D /* CopyFiles */,
3BC65E0F2584F3AD0063AFF1 /* CopyFiles */, 3BC65E0F2584F3AD0063AFF1 /* CopyFiles */,
3B251D9F26DA2C2A00E5D09B /* CopyFiles */,
3B522D79259BA0E3003301C4 /* Embed Frameworks */, 3B522D79259BA0E3003301C4 /* Embed Frameworks */,
); );
buildRules = ( buildRules = (
@ -1936,6 +1993,7 @@
3BD2B6F82565AEC0003DAD8A /* Resources */, 3BD2B6F82565AEC0003DAD8A /* Resources */,
3B1C233725A17CAB0075EF5D /* CopyFiles */, 3B1C233725A17CAB0075EF5D /* CopyFiles */,
3B5A843B2569F95A00BAF2E5 /* CopyFiles */, 3B5A843B2569F95A00BAF2E5 /* CopyFiles */,
3B251DA726DA2E8A00E5D09B /* CopyFiles */,
3B522D7C259BA0E8003301C4 /* Embed Frameworks */, 3B522D7C259BA0E8003301C4 /* Embed Frameworks */,
); );
buildRules = ( buildRules = (

2
src/filesystem/filesystemImpl.h
View file

@ -28,6 +28,8 @@ std::string getDefaultGameRoot();
std::string getPathForAsset(const char *baseName, const char *ext); std::string getPathForAsset(const char *baseName, const char *ext);
std::string contentsOfAssetAsString(const char *baseName, const char *ext); std::string contentsOfAssetAsString(const char *baseName, const char *ext);
std::string getResourcePath();
#ifdef MKXPZ_DEBUG #ifdef MKXPZ_DEBUG
std::string selectPath(SDL_Window *win); std::string selectPath(SDL_Window *win);
#endif #endif

4
src/filesystem/filesystemImplApple.mm
View file

@ -96,6 +96,10 @@ std::string filesystemImpl::contentsOfAssetAsString(const char *baseName, const
} }
std::string filesystemImpl::getResourcePath() {
return std::string(NSTOPATH(NSBundle.mainBundle.resourcePath));
}
#ifdef MKXPZ_DEBUG #ifdef MKXPZ_DEBUG
std::string filesystemImpl::selectPath(SDL_Window *win) { std::string filesystemImpl::selectPath(SDL_Window *win) {
NSOpenPanel *panel = [NSOpenPanel openPanel]; NSOpenPanel *panel = [NSOpenPanel openPanel];