From 13a6f4b9241cb5df2416ca53a27e368f7b4e89d6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 10 Dec 2014 01:39:55 -0800 Subject: [PATCH] 3DS: Fixes to CMakeToolchain --- src/platform/3ds/CMakeToolchain.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/platform/3ds/CMakeToolchain.txt b/src/platform/3ds/CMakeToolchain.txt index f77f741d9..20f945cf7 100644 --- a/src/platform/3ds/CMakeToolchain.txt +++ b/src/platform/3ds/CMakeToolchain.txt @@ -16,18 +16,18 @@ set(inc_flags -I${DEVKITPRO}/libctru/include) set(arch_flags "-march=armv6k -mtune=mpcore -mfpu=vfp -mfloat-abi=softfp") set(link_flags "-L${DEVKITPRO}/libctru/lib -lctru -lm -specs=3dsx.specs ${arch_flags}") -set(CMAKE_SYSTEM_NAME Unknown CACHE INTERNAL "system name") +set(CMAKE_SYSTEM_NAME Generic CACHE INTERNAL "system name") set(CMAKE_SYSTEM_PROCESSOR arm CACHE INTERNAL "processor") set(CMAKE_LIBRARY_ARCHITECTURE arm-none-eabi CACHE INTERNAL "abi") -set(CMAKE_AR ${cross_prefix}ar) -set(CMAKE_C_COMPILER ${cross_prefix}gcc) -set(CMAKE_CXX_COMPILER ${cross_prefix}g++) -set(CMAKE_ASM_COMPILER ${cross_prefix}gcc) +set(CMAKE_AR ${cross_prefix}ar CACHE INTERNAL "archiver") +set(CMAKE_C_COMPILER ${cross_prefix}gcc CACHE INTERNAL "c compiler") +set(CMAKE_CXX_COMPILER ${cross_prefix}g++ CACHE INTERNAL "cxx compiler") +set(CMAKE_ASM_COMPILER ${cross_prefix}gcc CACHE INTERNAL "assembler") set(common_flags "${arch_flags} -mword-relocations ${inc_flags}") set(CMAKE_C_FLAGS ${common_flags} CACHE INTERNAL "c compiler flags") set(CMAKE_ASM_FLAGS ${common_flags} CACHE INTERNAL "c compiler flags") set(CMAKE_CXX_FLAGS ${common_flags} CACHE INTERNAL "cxx compiler flags") -set(CMAKE_LINKER ${cross_prefix}ld) +set(CMAKE_LINKER ${cross_prefix}ld CACHE INTERNAL "linker") set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags") set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags")