fixed a few warnings when compiling with gcc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c614bae216854ae40f13aa1876a5ca5d5b6f8a6..2bb0e901fff47cca7aa814f7acfed2735b299ab8 100644 (file)
--- 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 34197b9853ee20a177e8a5dfa7b7e4ee8c9fcfcd..aac08309ad12d843493c5fc1120a22d37f33a1a2 100644 (file)
--- 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 b759abc3e897988268f621f88faa1c11f09eb7b8..685472aff50b436ef2d78ce1a1b3d2dad60db10a 100644 (file)
--- 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++) {