Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: 3DS/Wii tiny cleanup

Browse Source
This commit is contained in:
Vicki Pfau 2020-08-03 15:53:47 -07:00
parent b02fba9d28
commit 1950780999
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -261,10 +261,6 @@ if(DEFINED 3DS OR DEFINED PSP2 OR DEFINED WII OR DEFINED SWITCH)
set(USE_LIBZIP OFF CACHE BOOL "") set(USE_LIBZIP OFF CACHE BOOL "")
endif() endif()
if(DEFINED 3DS)
add_definitions(-DFIXED_ROM_BUFFER)
endif()
if(DEFINED SWITCH) if(DEFINED SWITCH)
set(BUILD_GLES3 ON CACHE BOOL "Build with OpenGL|ES 3" FORCE) set(BUILD_GLES3 ON CACHE BOOL "Build with OpenGL|ES 3" FORCE)
endif() endif()
@ -282,10 +278,6 @@ if(WII)
add_definitions(-U__STRICT_ANSI__) add_definitions(-U__STRICT_ANSI__)
endif() endif()
if(3DS OR WII)
add_definitions(-D_GNU_SOURCE)
endif()
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(CheckFunctionExists) include(CheckFunctionExists)
include(CheckIncludeFiles) include(CheckIncludeFiles)

2
src/platform/3ds/CMakeLists.txt
View File

@ -10,7 +10,7 @@ find_program(RAW2C raw2c)
set(STRIP "${cross_prefix_path}strip" CACHE INTERNAL "symbol stripper") set(STRIP "${cross_prefix_path}strip" CACHE INTERNAL "symbol stripper")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format" PARENT_SCOPE) 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}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(${CMAKE_BUILD_TYPE} STREQUAL Debug OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo) if(${CMAKE_BUILD_TYPE} STREQUAL Debug OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo)

2
src/platform/wii/CMakeLists.txt
View File

@ -3,7 +3,7 @@ find_program(GXTEXCONV gxtexconv)
find_program(RAW2C raw2c) find_program(RAW2C raw2c)
find_program(WIILOAD wiiload) 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) 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}) include_directories(${CMAKE_CURRENT_BINARY_DIR})