all repos — mgba @ a38bcb904d70acac5a9244b766ca46ff252feaae

mGBA Game Boy Advance Emulator

All: Refresh port building a bit
Jeffrey Pfau jeffrey@endrift.com
Tue, 29 Dec 2015 13:21:55 -0800
commit

a38bcb904d70acac5a9244b766ca46ff252feaae

parent

c00df2ce6e999330472eec55891b1351ea862375

M CMakeLists.txtCMakeLists.txt

@@ -189,6 +189,11 @@ if(PSP2 OR WII)

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format") endif() +if(DEFINED 3DS OR DEFINED PSP2 OR DEFINED WII) + set(USE_LZMA OFF) + set(USE_GDB_STUB OFF) +endif() + if(WII) add_definitions(-U__STRICT_ANSI__) endif()

@@ -210,7 +215,9 @@ check_function_exists(freelocale HAVE_FREELOCALE)

check_function_exists(uselocale HAVE_USELOCALE) check_function_exists(setlocale HAVE_SETLOCALE) else() - set(DISABLE_DEPS ON CACHE BOOL "This platform cannot build with dependencies" FORCE) + 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() set(DISABLE_FRONTENDS ON) set(MINIMAL_CORE ON) endif()
M src/platform/3ds/CMakeToolchain.txtsrc/platform/3ds/CMakeToolchain.txt

@@ -45,5 +45,11 @@ set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags")

set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags") set(CMAKE_SHARED_LINKER_FLAGS ${link_flags} CACHE INTERNAL "shared link flags") +set(CMAKE_FIND_ROOT_PATH ${DEVKITARM}/arm-none-eabi) +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER CACHE INTERNAL "") +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY CACHE INTERNAL "") +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY CACHE INTERNAL "") +set(PKG_CONFIG_EXECUTABLE "/dev/null" CACHE INTERNAL "" FORCE) + set(3DS ON) add_definitions(-D_3DS -DARM11)
M src/platform/psp2/CMakeToolchain.vitasdksrc/platform/psp2/CMakeToolchain.vitasdk

@@ -34,7 +34,10 @@ set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags")

set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags") set(CMAKE_SHARED_LINKER_FLAGS ${link_flags} CACHE INTERNAL "shared link flags") -set(CMAKE_PREFIX_PATH ${VITASDK}/arm-vita-eabi) +set(CMAKE_FIND_ROOT_PATH ${VITASDK}/arm-vita-eabi) +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER CACHE INTERNAL "") +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY CACHE INTERNAL "") +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY CACHE INTERNAL "") set(PKG_CONFIG_EXECUTABLE "/dev/null" CACHE INTERNAL "" FORCE) set(PSP2 ON)
M src/platform/wii/CMakeToolchain.txtsrc/platform/wii/CMakeToolchain.txt

@@ -39,5 +39,11 @@ set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags")

set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags") set(CMAKE_SHARED_LINKER_FLAGS ${link_flags} CACHE INTERNAL "shared link flags") +set(CMAKE_FIND_ROOT_PATH ${DEVKITPPC}/powerpc-eabi) +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER CACHE INTERNAL "") +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY CACHE INTERNAL "") +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY CACHE INTERNAL "") +set(PKG_CONFIG_EXECUTABLE "/dev/null" CACHE INTERNAL "" FORCE) + set(WII ON) add_definitions(-DGEKKO)