diff --git a/binding/binding-mri.cpp b/binding/binding-mri.cpp index 7250272..e5d8aad 100644 --- a/binding/binding-mri.cpp +++ b/binding/binding-mri.cpp @@ -68,7 +68,9 @@ extern const char module_rpg3[]; static void mriBindingExecute(); static void mriBindingTerminate(); static void mriBindingReset(); +#ifdef __WIN32__ static void configureWindowsStreams(); +#endif ScriptBinding scriptBindingImpl = {mriBindingExecute, mriBindingTerminate, mriBindingReset}; diff --git a/macos/mkxp-z.xcodeproj/project.pbxproj b/macos/mkxp-z.xcodeproj/project.pbxproj index 4f2f7c6..11b4253 100644 --- a/macos/mkxp-z.xcodeproj/project.pbxproj +++ b/macos/mkxp-z.xcodeproj/project.pbxproj @@ -749,6 +749,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 3B012198261544A0001E574A /* string-util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "string-util.h"; sourceTree = ""; }; 3B10EC832568E78400372D13 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../assets/icon.png; sourceTree = ""; }; 3B10EC842568E78400372D13 /* liberation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = liberation.ttf; path = ../assets/liberation.ttf; sourceTree = ""; }; 3B10EC852568E78400372D13 /* wqymicrohei.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = wqymicrohei.ttf; path = ../assets/wqymicrohei.ttf; sourceTree = ""; }; @@ -1321,6 +1322,7 @@ 3B10ED3D2568E95D00372D13 /* serializable.h */, 3B10ED3E2568E95D00372D13 /* disposable.h */, 3B10ED3F2568E95D00372D13 /* serial-util.h */, + 3B012198261544A0001E574A /* string-util.h */, 3B10ED402568E95D00372D13 /* util.h */, 3B10ED412568E95D00372D13 /* exception.h */, 3B10ED422568E95D00372D13 /* debugwriter.h */, diff --git a/meson_options.txt b/meson_options.txt index d209e61..d4e4516 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,7 +2,6 @@ option('mri_version', type: 'string', value: '3.0', description: 'Version of MRI option('mri_includes', type: 'string', value: '', description: 'Ruby manual include path') option('mri_libpath', type: 'string', value: '', description: 'Ruby manual lib path') option('mri_library', type: 'string', value: '', description: 'Ruby manual link name') -option('macos_min_version', type: 'string', value: '', description: 'Minimum macOS system version to support (does not affect dependencies)') option('force32', type: 'boolean', value: false, description: 'Force compiler to build a 32-bit executable') option('cxx11_experimental', type: 'boolean', value: false, description: 'Toggles between using ghc/filesystem or C++11 ') diff --git a/src/util/string-util.h b/src/util/string-util.h index 2d771f2..b89ab0e 100644 --- a/src/util/string-util.h +++ b/src/util/string-util.h @@ -1,6 +1,8 @@ #ifndef STRING_UTIL_H #define STRING_UTIL_H +#ifndef __MACOSX__ + #include // Copies the given text with additional newlines every X characters. @@ -33,9 +35,13 @@ static std::string copyWithNewlines(const char *input, const unsigned limit) return output; } +/* static std::string copyWithNewlines(const std::string& input, const unsigned limit) { return copyWithNewlines(input.c_str(), limit); } + */ + +#endif #endif // STRING_UTIL_H