all repos — mgba @ 1950780999d5642cb41086116ee7b256955a54a7

mGBA Game Boy Advance Emulator

CMake: 3DS/Wii tiny cleanup
Vicki Pfau vi@endrift.com
Mon, 03 Aug 2020 15:53:47 -0700
commit

1950780999d5642cb41086116ee7b256955a54a7

parent

b02fba9d28ee22fb0c8a2d9aa6488c7319b5c401

3 files changed, 2 insertions(+), 10 deletions(-)

jump to
M CMakeLists.txtCMakeLists.txt

@@ -261,10 +261,6 @@ set(USE_DISCORD_RPC OFF)

set(USE_LIBZIP OFF CACHE BOOL "") endif() -if(DEFINED 3DS) - add_definitions(-DFIXED_ROM_BUFFER) -endif() - if(DEFINED SWITCH) set(BUILD_GLES3 ON CACHE BOOL "Build with OpenGL|ES 3" FORCE) endif()

@@ -280,10 +276,6 @@ endif()

if(WII) add_definitions(-U__STRICT_ANSI__) -endif() - -if(3DS OR WII) - add_definitions(-D_GNU_SOURCE) endif() include(CheckCCompilerFlag)
M src/platform/3ds/CMakeLists.txtsrc/platform/3ds/CMakeLists.txt

@@ -10,7 +10,7 @@ find_program(RAW2C raw2c)

set(STRIP "${cross_prefix_path}strip" CACHE INTERNAL "symbol stripper") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format" PARENT_SCOPE) -set(OS_DEFINES COLOR_16_BIT COLOR_5_6_5 IOAPI_NO_64) +set(OS_DEFINES _GNU_SOURCE COLOR_16_BIT COLOR_5_6_5 FIXED_ROM_BUFFER IOAPI_NO_64) include_directories(${CMAKE_CURRENT_BINARY_DIR}) if(${CMAKE_BUILD_TYPE} STREQUAL Debug OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo)
M src/platform/wii/CMakeLists.txtsrc/platform/wii/CMakeLists.txt

@@ -3,7 +3,7 @@ find_program(GXTEXCONV gxtexconv)

find_program(RAW2C raw2c) find_program(WIILOAD wiiload) -set(OS_DEFINES COLOR_16_BIT COLOR_5_6_5 USE_VFS_FILE IOAPI_NO_64 FIXED_ROM_BUFFER) +set(OS_DEFINES _GNU_SOURCE COLOR_16_BIT COLOR_5_6_5 USE_VFS_FILE IOAPI_NO_64 FIXED_ROM_BUFFER) list(APPEND CORE_VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-file.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-dirent.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-devlist.c) include_directories(${CMAKE_CURRENT_BINARY_DIR})