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

cleanup

Browse source
This commit is contained in:
Struma 2021-03-31 20:08:19 -04:00 • committed by Roza
parent 7c6704580b
commit 4784a36e54
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binding/binding-mri.cpp
View file

@ -68,7 +68,9 @@ extern const char module_rpg3[];
static void mriBindingExecute(); static void mriBindingExecute();
static void mriBindingTerminate(); static void mriBindingTerminate();
static void mriBindingReset(); static void mriBindingReset();
#ifdef __WIN32__
static void configureWindowsStreams(); static void configureWindowsStreams();
#endif
ScriptBinding scriptBindingImpl = {mriBindingExecute, mriBindingTerminate, ScriptBinding scriptBindingImpl = {mriBindingExecute, mriBindingTerminate,
mriBindingReset}; mriBindingReset};

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

@ -749,6 +749,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
3B012198261544A0001E574A /* string-util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "string-util.h"; sourceTree = "<group>"; };
3B10EC832568E78400372D13 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../assets/icon.png; sourceTree = "<group>"; }; 3B10EC832568E78400372D13 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../assets/icon.png; sourceTree = "<group>"; };
3B10EC842568E78400372D13 /* liberation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = liberation.ttf; path = ../assets/liberation.ttf; sourceTree = "<group>"; }; 3B10EC842568E78400372D13 /* liberation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = liberation.ttf; path = ../assets/liberation.ttf; sourceTree = "<group>"; };
3B10EC852568E78400372D13 /* wqymicrohei.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = wqymicrohei.ttf; path = ../assets/wqymicrohei.ttf; sourceTree = "<group>"; }; 3B10EC852568E78400372D13 /* wqymicrohei.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = wqymicrohei.ttf; path = ../assets/wqymicrohei.ttf; sourceTree = "<group>"; };
@ -1321,6 +1322,7 @@
3B10ED3D2568E95D00372D13 /* serializable.h */, 3B10ED3D2568E95D00372D13 /* serializable.h */,
3B10ED3E2568E95D00372D13 /* disposable.h */, 3B10ED3E2568E95D00372D13 /* disposable.h */,
3B10ED3F2568E95D00372D13 /* serial-util.h */, 3B10ED3F2568E95D00372D13 /* serial-util.h */,
3B012198261544A0001E574A /* string-util.h */,
3B10ED402568E95D00372D13 /* util.h */, 3B10ED402568E95D00372D13 /* util.h */,
3B10ED412568E95D00372D13 /* exception.h */, 3B10ED412568E95D00372D13 /* exception.h */,
3B10ED422568E95D00372D13 /* debugwriter.h */, 3B10ED422568E95D00372D13 /* debugwriter.h */,

1
meson_options.txt
View file

@ -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_includes', type: 'string', value: '', description: 'Ruby manual include path')
option('mri_libpath', type: 'string', value: '', description: 'Ruby manual lib path') option('mri_libpath', type: 'string', value: '', description: 'Ruby manual lib path')
option('mri_library', type: 'string', value: '', description: 'Ruby manual link name') 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('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 <experimental/filesystem>') option('cxx11_experimental', type: 'boolean', value: false, description: 'Toggles between using ghc/filesystem or C++11 <experimental/filesystem>')

6
src/util/string-util.h
View file

@ -1,6 +1,8 @@
#ifndef STRING_UTIL_H #ifndef STRING_UTIL_H
#define STRING_UTIL_H #define STRING_UTIL_H
#ifndef __MACOSX__
#include <string> #include <string>
// Copies the given text with additional newlines every X characters. // 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; return output;
} }
/*
static std::string copyWithNewlines(const std::string& input, const unsigned limit) static std::string copyWithNewlines(const std::string& input, const unsigned limit)
{ {
return copyWithNewlines(input.c_str(), limit); return copyWithNewlines(input.c_str(), limit);
} }
*/
#endif
#endif // STRING_UTIL_H #endif // STRING_UTIL_H