38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 74b67f36961839fcbc1caa23930151bd9b3e9d7e 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 6/8] Fix compiling on GCC 4.7
|
|
|
|
---
|
|
nall/string.hpp | 2 +-
|
|
ui-libsnes/libsnes.cpp | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/nall/string.hpp b/nall/string.hpp
|
|
index 996cd68..4747e4c 100755
|
|
--- a/nall/string.hpp
|
|
+++ b/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/ui-libsnes/libsnes.cpp b/ui-libsnes/libsnes.cpp
|
|
index 3b2be7a..ca90762 100755
|
|
--- a/ui-libsnes/libsnes.cpp
|
|
+++ b/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.8.4.4
|
|
|