Fix some compilation problems on macOS

Experimental, to be tested on other platforms
RiSKeD · Jan 20, 2020 · 1785008 · 1785008
1 parent f996d31
commit 1785008
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,15 @@
 cmake_minimum_required(VERSION 2.8)
 project(NanoboyAdvance C CXX)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 set(PLATFORM "sdl" CACHE STRING "Build Target (sdl, ...)")
 
 set(COMPILE_FLAGS   "${COMPILE_FLAGS} -Ofast")
 set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${COMPILE_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS} -std=c++1z")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}")
 
 #add_definitions(-pg)
 #set(CMAKE_EXE_LINKER_FLAGS -pg)

diff --git a/source/gba/CMakeLists.txt b/source/gba/CMakeLists.txt
@@ -42,4 +42,3 @@ set(HEADERS
 )
 
 add_library(gba STATIC ${SOURCES} ${HEADERS})
-target_link_libraries(gba stdc++fs)
diff --git a/source/platform/sdl/CMakeLists.txt b/source/platform/sdl/CMakeLists.txt
@@ -7,6 +7,7 @@ SET(HEADERS
 
 INCLUDE(FindSDL2 REQUIRED)
 FIND_PACKAGE(SDL2 REQUIRED)
+INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
 
 ADD_EXECUTABLE(NanoboyAdvance-SDL ${SOURCES} ${HEADERS})
 TARGET_LINK_LIBRARIES(NanoboyAdvance-SDL gba)

diff --git a/source/platform/sdl/main.cpp b/source/platform/sdl/main.cpp
@@ -17,11 +17,7 @@
   * along with NanoboyAdvance. If not, see <http://www.gnu.org/licenses/>.
   */
 
-#ifdef _MSC_VER
 #include "SDL.h"
-#else
-#include <SDL2/SDL.h>
-#endif
 
 #undef main
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,3 @@ set(HEADERS
		)

		add_library(gba STATIC ${SOURCES} ${HEADERS})
		target_link_libraries(gba stdc++fs)