From c15ed46e7a84d1539407d9d38cd6b14a7af2eb02 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Mon, 18 Mar 2019 19:01:58 +1100 Subject: [PATCH] cmake: don't use include_directories (reverts add09e7) Turns out this actually doesn't work? god only knows how it didn't get caught. --- share/wut.toolchain.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/share/wut.toolchain.cmake b/share/wut.toolchain.cmake index d537ab1ee..7f27c4829 100644 --- a/share/wut.toolchain.cmake +++ b/share/wut.toolchain.cmake @@ -58,15 +58,12 @@ set(CMAKE_LINKER "${DEVKITPPC_BIN}/powerpc-eabi-ld" CACHE PATH "") set(CMAKE_AR "${DEVKITPPC_BIN}/powerpc-eabi-ar" CACHE PATH "") set(CMAKE_STRIP "${DEVKITPPC_BIN}/powerpc-eabi-strip" CACHE PATH "") -set(WUT_C_FLAGS "-mcpu=750 -meabi -mhard-float -Wl,-q -D__WIIU__ -D__WUT__") +set(WUT_C_FLAGS "-mcpu=750 -meabi -mhard-float -Wl,-q -D__WIIU__ -D__WUT__ -isystem \"${WUT_ROOT}/include\"") set(CMAKE_C_FLAGS "${WUT_C_FLAGS}" CACHE STRING "") set(CMAKE_CXX_FLAGS "${WUT_C_FLAGS}" CACHE STRING "") set(CMAKE_ASM_FLAGS "${WUT_C_FLAGS}" CACHE STRING "") set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,nocopyreloc -T \"${WUT_ROOT}/share/wut.ld\" \"-L${WUT_ROOT}/lib\"" CACHE STRING "") -# Include paths for wut -include_directories(BEFORE SYSTEM "${WUT_ROOT}/include") - # Setup root to exclude host system headers + libraries set(CMAKE_FIND_ROOT_PATH "${DEVKITPPC}" "${DEVKITPRO}/tools/bin" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)