From: slack <slack@codemaniacs.com>
Date: Wed, 13 May 2009 18:27:49 +0000 (+0200)
Subject: fixed a few warnings when compiling with gcc
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=90ab2876f1de92e4c2b7996f96bb2e4c11f3bd15;p=wenboi.git

fixed a few warnings when compiling with gcc
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c614ba..2bb0e90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
 
 IF(CMAKE_COMPILER_IS_GNUCC)
   MESSAGE("Setting warning options")
-  SET(CMAKE_C_FLAGS_DEBUG "-g -Wall")
+  SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wno-unknown-pragmas")
   SET(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
diff --git a/core/GBVideo.h b/core/GBVideo.h
index 34197b9..aac0830 100644
--- a/core/GBVideo.h
+++ b/core/GBVideo.h
@@ -61,7 +61,7 @@ class GBVideo
 
 	u32 colors[4];
 	u32 frames_rendered;
-	u8 *oldscreen, *newscreen, *screen;
+	u8 *screen, *oldscreen, *newscreen;
 
 	public:
 	enum DisplayMode {
diff --git a/qtboi/QtBoiMainWindow.cc b/qtboi/QtBoiMainWindow.cc
index b759abc..685472a 100644
--- a/qtboi/QtBoiMainWindow.cc
+++ b/qtboi/QtBoiMainWindow.cc
@@ -225,7 +225,7 @@ void QtBoiMainWindow::onDisassemblyAnchorClicked(const QUrl& url)
 		disassembly->refresh();
 	}
     else if (url.scheme() == "togglebp") {
-        u32 addr = url.path().toUInt();
+        int addr = url.path().toUInt();
         bool bpFound = false;
         GameBoy::BreakpointMap bpmap = emuThread->gb.get_breakpoints();
         for (GameBoy::BreakpointMap::iterator i=bpmap.begin(); i != bpmap.end(); i++) {