all repos — mgba @ d6952b6fa61ff7ce176f6293218b6d0551ef10dd

mGBA Game Boy Advance Emulator

3DS: Add 3dstool relocation
Jeffrey Pfau jeffrey@endrift.com
Mon, 08 Dec 2014 18:58:45 -0800
commit

d6952b6fa61ff7ce176f6293218b6d0551ef10dd

parent

211616e4f139d90870f5bcfb798485e493e5bd8d

2 files changed, 5 insertions(+), 2 deletions(-)

jump to
M CMakeLists.txtCMakeLists.txt

@@ -217,8 +217,9 @@ install(FILES ${CMAKE_SOURCE_DIR}/tools/perf.py DESTINATION "${CMAKE_INSTALL_LIBDIR}/${BINARY_NAME}")

endif() if(3DS) - add_executable(${BINARY_NAME}-elf ${CMAKE_SOURCE_DIR}/src/platform/3ds/main.c) - target_link_libraries(${BINARY_NAME}-elf ${BINARY_NAME} m ${OS_LIB}) + add_executable(${BINARY_NAME}.elf ${CMAKE_SOURCE_DIR}/src/platform/3ds/main.c) + target_link_libraries(${BINARY_NAME}.elf ${BINARY_NAME} m ${OS_LIB}) + add_custom_command(TARGET ${BINARY_NAME}.elf POST_BUILD COMMAND ${3DSXTOOL} ${BINARY_NAME}.elf ${BINARY_NAME}.3dsx) endif() # Packaging
M src/platform/3ds/CMakeToolchain.txtsrc/platform/3ds/CMakeToolchain.txt

@@ -33,5 +33,7 @@ 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(3DSXTOOL ${toolchain_bin_dir}/3dsxtool) + set(3DS ON) add_definitions(-D_3DS -DARM11)