Merge bc13994947 into 2cc2ebca31

.gitignore

@@ -10,4 +10,6 @@ Makefile
 mkxp
 xxd+
 
-/build
+/build
+mkxp.layout
+mkxp.cbp

binding-mri/binding-mri.cpp

@@ -26,8 +26,9 @@
 #include "filesystem.h"
 #include "util.h"
 #include "debugwriter.h"
-
-#include <ruby.h>
+extern "C" {
+    #include <ruby.h>
+}
 #include <ruby/encoding.h>
 
 #include <string>

binding-mri/binding-util.h

@@ -21,9 +21,9 @@
 
 #ifndef BINDING_UTIL_H
 #define BINDING_UTIL_H
-
-#include <ruby.h>
-
+extern "C" {
+    #include <ruby.h>
+}
 #include "exception.h"
 
 enum RbException

binding-mri/etc-binding.cpp

@@ -18,7 +18,6 @@
 ** You should have received a copy of the GNU General Public License
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #include "etc.h"
 #include "binding-util.h"
 #include "serializable-binding.h"

src/filesystem.cpp

@@ -328,7 +328,7 @@ RGSS_openArchive(PHYSFS_Io *io, const char *, int forWrite)
 		nameLen ^= advanceMagic(magic);
 
 		static char nameBuf[512];
-		uint i;
+		unsigned int i;
 		for (i = 0; i < nameLen; ++i)
 		{
 			char c;