From 90dc8b29a6e427d803742691cac695740330b362 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Tue, 25 May 2021 21:29:36 +0200 Subject: [PATCH] bump to gint 2.5 (simplified logic) gint 2.5 now provides flags for OpenLibm and the libc. --- CMakeLists.txt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b5916..fc0b74b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(FxLibcTest) include(GenerateG1A) include(GenerateG3A) include(Fxconv) -find_package(Gint 2.4 REQUIRED) +find_package(Gint 2.5 REQUIRED) find_package(JustUI 1.0 REQUIRED) # FXLIBC_INSTALL: Additional folders to read includes and libs from @@ -50,15 +50,8 @@ add_executable(fxlibctest ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}}) target_compile_options(fxlibctest PRIVATE -Wall -Wextra -Os -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}/src/=) target_link_options(fxlibctest PRIVATE -Wl,-Map=map -Wl,--print-memory-usage) -target_include_directories(fxlibctest PRIVATE - include/ - "${FXSDK_COMPILER_INSTALL}/include/openlibm/") -target_link_libraries(fxlibctest JustUI::JustUI Gint::Gint -lc -lopenlibm) - -foreach(FOLDER IN LISTS FXLIBC_INSTALL) - target_include_directories(fxlibctest PRIVATE "${FOLDER}/include") - target_link_directories(fxlibctest PRIVATE "${FOLDER}/lib") -endforeach() +target_include_directories(fxlibctest PRIVATE include/) +target_link_libraries(fxlibctest JustUI::JustUI Gint::Gint) if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G) generate_g1a(TARGET fxlibctest OUTPUT "FxLibcT.g1a"