From 0fa4cf527bb8bdea4b423ff06cdf8067f56be875 Mon Sep 17 00:00:00 2001 From: Aloshi Date: Tue, 8 Oct 2013 16:31:29 -0500 Subject: [PATCH] Fixed SDL2 warnings on Linux (-W-no-attributes). Fixed #include for old Font.h location in Renderer_init_sdlgl.cpp. --- CMakeLists.txt | 2 +- src/Renderer_init_sdlgl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cd614a12..efc6a3d79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) message(SEND_ERROR "You need at least G++ 4.7 to compile EmulationStation!") endif() #set up compiler flags for GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") #support C++11 for std::, optimize + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes") #support C++11 for std::, optimize set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") #strip binary endif() diff --git a/src/Renderer_init_sdlgl.cpp b/src/Renderer_init_sdlgl.cpp index cf484e3a8..d807fcdaf 100644 --- a/src/Renderer_init_sdlgl.cpp +++ b/src/Renderer_init_sdlgl.cpp @@ -2,7 +2,7 @@ #include #include "platform.h" #include GLHEADER -#include "Font.h" +#include "resources/Font.h" #include #include "Log.h" #include "ImageIO.h"