Merge pull request #30 from rkitover/linux_fixes

Fix namespace issue, missing parens, missing func

CMakeLists.txt

@@ -62,7 +62,7 @@ ENDIF( NOT VERSION )
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     ADD_DEFINITIONS(-DDEBUG)
 ELSE()
-    ADD_DEFINITIONS(-NDEBUG)
+    ADD_DEFINITIONS(-DNDEBUG)
 ENDIF()
 
 # Fill in SDLMAIN_LIBRARY on OS X manually to avoid using SDLMain.m

src/gtk/CMakeLists.txt

@@ -47,7 +47,7 @@ SET(SRC_GTK
     soundconfig.cpp
     screenarea.cpp
     screenarea-cairo.cpp
-    #screenarea-opengl.cpp
+    screenarea-opengl.cpp
     tools.cpp
     window.cpp
     ../sdl/inputSDL.cpp

src/gtk/screenarea.cpp

@@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int _iHeight, int _iScale)
     pixbuf->fill(0);
 
 #if !GTK_CHECK_VERSION(3, 0, 0)
-    m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0);
+    m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
 #else
     m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
 #endif

src/sdl/expr.cpp

@@ -85,14 +85,10 @@ enum yytokentype {
 /* Copy the first part of user declarations.  */
 #line 1 "expr.ypp"
 
-namespace std {
 #include <memory.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-}
-
-using namespace std;
+#include <cstdlib>
 
 #include "../System.h"
 #include "../gba/elf.h"

src/sdl/expr.ypp

@@ -1,11 +1,8 @@
 %{
-namespace std {  
 #include <stdio.h>
 #include <memory.h>
-#include <stdlib.h>
 #include <string.h>
 #include <cstdlib>
-}
 
 #include "../System.h"
 #include "../gba/elf.h"