all repos — mgba @ 4f2136f548987c4f1eb6bc163cbd1b92b7125e61

mGBA Game Boy Advance Emulator

3DS: Fixes for new dkA release
Vicki Pfau vi@endrift.com
Mon, 20 Mar 2017 20:52:35 -0700
commit

4f2136f548987c4f1eb6bc163cbd1b92b7125e61

parent

91c0f95e5f373bc084a050ae55b9fe93c32509cc

1 files changed, 13 insertions(+), 2 deletions(-)

jump to
M CMakeLists.txtCMakeLists.txt

@@ -160,7 +160,7 @@ list(APPEND UTIL_SRC ${CMAKE_CURRENT_BINARY_DIR}/version.c)

source_group("Generated sources" FILES ${CMAKE_CURRENT_BINARY_DIR}/version.c) # Advanced settings -if(NOT 3DS) +if(NOT DEFINED 3DS) # LTO appears to make 3DS binary slower set(DEFAULT_LTO ON) else()

@@ -267,6 +267,10 @@ if(WII)

add_definitions(-U__STRICT_ANSI__) endif() +if(DEFINED 3DS) + add_definitions(-D_GNU_SOURCE) +endif() + include(CheckFunctionExists) check_function_exists(strdup HAVE_STRDUP) check_function_exists(strndup HAVE_STRNDUP)

@@ -284,6 +288,13 @@ check_function_exists(freelocale HAVE_FREELOCALE)

check_function_exists(uselocale HAVE_USELOCALE) check_function_exists(setlocale HAVE_SETLOCALE) else() + if(DEFINED 3DS) + check_function_exists(snprintf_l HAVE_SNPRINTF_L) + check_function_exists(newlocale HAVE_NEWLOCALE) + check_function_exists(freelocale HAVE_FREELOCALE) + check_function_exists(uselocale HAVE_USELOCALE) + check_function_exists(setlocale HAVE_SETLOCALE) + endif() if(NOT DEFINED 3DS AND NOT DEFINED PSP2 AND NOT DEFINED WII) set(DISABLE_DEPS ON CACHE BOOL "This platform cannot build with dependencies" FORCE) endif()

@@ -308,7 +319,7 @@ if(HAVE_LOCALTIME_R)

list(APPEND FUNCTION_DEFINES HAVE_LOCALTIME_R) endif() -if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE) +if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE OR 3DS) list(APPEND FUNCTION_DEFINES HAVE_LOCALE) if (HAVE_STRTOF_L) list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L)