Add bsnes patches to fix libsnes to compile on GCC 4.7

This commit is contained in:
Ilari Liusvaara 2012-10-14 23:35:03 +03:00
parent 5bae541b8b
commit 07e9440958
3 changed files with 87 additions and 0 deletions

View file

@ -0,0 +1,26 @@
From 36777ec11c093a1cc902b8b72188e06f49a4d0f2 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sun, 14 Oct 2012 23:31:36 +0300
Subject: [PATCH] Fix compiling on GCC 4.7
---
bsnes/nall/string.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsnes/nall/string.hpp b/bsnes/nall/string.hpp
index 1b255ce..07a64df 100755
--- a/bsnes/nall/string.hpp
+++ b/bsnes/nall/string.hpp
@@ -25,8 +25,8 @@
#include <nall/string/base.hpp>
#include <nall/string/bml.hpp>
#include <nall/string/bsv.hpp>
-#include <nall/string/core.hpp>
#include <nall/string/cast.hpp>
+#include <nall/string/core.hpp>
#include <nall/string/compare.hpp>
#include <nall/string/convert.hpp>
#include <nall/string/cstring.hpp>
--
1.7.10.4

View file

@ -0,0 +1,38 @@
From 919c8935121c2ec7cb96ce561044981526c1ca7e Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sun, 14 Oct 2012 23:29:40 +0300
Subject: [PATCH] Fix compiling on GCC 4.7
---
bsnes/nall/string.hpp | 2 +-
bsnes/ui-libsnes/libsnes.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/bsnes/nall/string.hpp b/bsnes/nall/string.hpp
index 996cd68..4747e4c 100755
--- a/bsnes/nall/string.hpp
+++ b/bsnes/nall/string.hpp
@@ -25,8 +25,8 @@
#include <nall/string/base.hpp>
#include <nall/string/bml.hpp>
#include <nall/string/bsv.hpp>
-#include <nall/string/core.hpp>
#include <nall/string/cast.hpp>
+#include <nall/string/core.hpp>
#include <nall/string/compare.hpp>
#include <nall/string/convert.hpp>
#include <nall/string/cstring.hpp>
diff --git a/bsnes/ui-libsnes/libsnes.cpp b/bsnes/ui-libsnes/libsnes.cpp
index 3b2be7a..ca90762 100755
--- a/bsnes/ui-libsnes/libsnes.cpp
+++ b/bsnes/ui-libsnes/libsnes.cpp
@@ -1,5 +1,6 @@
#include "libsnes.hpp"
#include <snes/snes.hpp>
+#include <gameboy/gameboy.hpp>
#include <nall/snes/cartridge.hpp>
#include <nall/gameboy/cartridge.hpp>
--
1.7.10.4

View file

@ -0,0 +1,23 @@
From d4a3678c9cfbca544af8069b42b9eaa0205f8ea3 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sun, 14 Oct 2012 23:25:33 +0300
Subject: [PATCH] Add missing include to libsnes.cpp
---
bsnes/target-libsnes/libsnes.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsnes/target-libsnes/libsnes.cpp b/bsnes/target-libsnes/libsnes.cpp
index 3b2be7a..ca90762 100755
--- a/bsnes/target-libsnes/libsnes.cpp
+++ b/bsnes/target-libsnes/libsnes.cpp
@@ -1,5 +1,6 @@
#include "libsnes.hpp"
#include <snes/snes.hpp>
+#include <gameboy/gameboy.hpp>
#include <nall/snes/cartridge.hpp>
#include <nall/gameboy/cartridge.hpp>
--
1.7.10.4