ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Always use devkitPro toolchain when applicable (fixes #1755)

This commit is contained in:
Vicki Pfau 2020-05-16 17:13:03 -07:00
parent 34c694c9a6
commit 503a7486e0
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -22,6 +22,7 @@ Emulation fixes:
- GBA Video: Fix Hblank timing - GBA Video: Fix Hblank timing
- GBA Video: Fix mosaic objects drawing past the end (fixes mgba.io/i/1702) - GBA Video: Fix mosaic objects drawing past the end (fixes mgba.io/i/1702)
Other fixes: Other fixes:
- CMake: Always use devkitPro toolchain when applicable (fixes mgba.io/i/1755)
- Core: Ensure ELF regions can be written before trying - Core: Ensure ELF regions can be written before trying
- Core: Fix ELF loading regression (fixes mgba.io/i/1669) - Core: Fix ELF loading regression (fixes mgba.io/i/1669)
- Core: Fix crash modifying hash table entry (fixes mgba.io/i/1673) - Core: Fix crash modifying hash table entry (fixes mgba.io/i/1673)

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

@ -7,7 +7,7 @@ find_program(BANNERTOOL bannertool)
find_program(MAKEROM makerom) find_program(MAKEROM makerom)
find_program(PICASSO picasso) find_program(PICASSO picasso)
find_program(RAW2C raw2c) find_program(RAW2C raw2c)
find_program(STRIP ${cross_prefix}strip) 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 COLOR_16_BIT COLOR_5_6_5 IOAPI_NO_64)

14
src/platform/cmake/devkitPro.cmake
View File

@ -14,18 +14,20 @@ function(create_devkit DEVKIT)
endif() endif()
set(CMAKE_PROGRAM_PATH ${DEVKIT${DEVKIT}}/bin CACHE INTERNAL "program path") set(CMAKE_PROGRAM_PATH ${DEVKIT${DEVKIT}}/bin CACHE INTERNAL "program path")
set(cross_prefix_path "${CMAKE_PROGRAM_PATH}/${cross_prefix}")
set(cross_prefix_path "${cross_prefix_path}" PARENT_SCOPE)
set(extension) set(extension)
if (CMAKE_HOST_WIN32) if (CMAKE_HOST_WIN32)
set(extension .exe) set(extension .exe)
endif() endif()
find_program(CMAKE_AR ${cross_prefix}gcc-ar${extension}) set(CMAKE_AR "${cross_prefix_path}gcc-ar${extension}" CACHE INTERNAL "archiver")
find_program(CMAKE_RANLIB ${cross_prefix}gcc-ranlib${extension}) set(CMAKE_RANLIB "${cross_prefix_path}gcc-ranlib${extension}" CACHE INTERNAL "archiver")
find_program(CMAKE_C_COMPILER ${cross_prefix}gcc${extension}) set(CMAKE_C_COMPILER "${cross_prefix_path}gcc${extension}" CACHE INTERNAL "c compiler")
find_program(CMAKE_CXX_COMPILER ${cross_prefix}g++${extension}) set(CMAKE_CXX_COMPILER "${cross_prefix_path}g++${extension}" CACHE INTERNAL "cxx compiler")
find_program(CMAKE_ASM_COMPILER ${cross_prefix}gcc${extension}) set(CMAKE_ASM_COMPILER "${cross_prefix_path}gcc${extension}" CACHE INTERNAL "assembler")
find_program(CMAKE_LINKER ${cross_prefix}ld${extension}) set(CMAKE_LINKER "${cross_prefix_path}ld${extension}" CACHE INTERNAL "linker")
set(CMAKE_C_FLAGS ${inc_flags} CACHE INTERNAL "c compiler flags") set(CMAKE_C_FLAGS ${inc_flags} CACHE INTERNAL "c compiler flags")
set(CMAKE_ASM_FLAGS ${inc_flags} CACHE INTERNAL "assembler flags") set(CMAKE_ASM_FLAGS ${inc_flags} CACHE INTERNAL "assembler flags")
set(CMAKE_CXX_FLAGS ${inc_flags} CACHE INTERNAL "cxx compiler flags") set(CMAKE_CXX_FLAGS ${inc_flags} CACHE INTERNAL "cxx compiler flags")