From c85182d07e367c41bbe857b10c77a368dccec5d4 Mon Sep 17 00:00:00 2001
From: Yann MAGNIN <yann.magnin@protonmail.com>
Date: Sun, 8 Jan 2023 13:11:13 +0100
Subject: [PATCH] update vxSDK integration

---
 .gitignore                 |  1 +
 CMakeLists.txt             |  4 +++-
 cmake/toolchain-vhex.cmake | 11 ++++-------
 vxsdk.toml                 | 22 +++++++++++++++++-----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 243922d..e87da89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /prefix
 *.txt
 !CMakeLists.txt
+.vxsdk/
 
 # GiteaPC config files
 giteapc-config.make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1405997..73adc85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,9 @@ if(FXLIBC_TARGET STREQUAL vhex-sh)
   list(APPEND TARGET_FOLDERS vhex sh-generic)
   set(FXLIBC_ARCH sh)
   add_definitions(-D__SUPPORT_VHEX_KERNEL)
-  set(CMAKE_INSTALL_PREFIX "${FXSDK_COMPILER_INSTALL}" CACHE PATH "..." FORCE)
+  set(CMAKE_INSTALL_PREFIX "${VXSDK_COMPILER_INSTALL}" CACHE PATH "..." FORCE)
+  set(INCDIR "${VXSDK_COMPILER_INSTALL}/include")
+  set(LIBDIR "${VXSDK_COMPILER_INSTALL}/lib")
 endif()
 
 if(FXLIBC_TARGET STREQUAL gint)
diff --git a/cmake/toolchain-vhex.cmake b/cmake/toolchain-vhex.cmake
index a7de855..52bc5f2 100644
--- a/cmake/toolchain-vhex.cmake
+++ b/cmake/toolchain-vhex.cmake
@@ -12,16 +12,13 @@ set(CMAKE_CXX_FLAGS_INIT "")
 
 add_compile_options(-nostdlib)
 add_link_options(-nostdlib)
-link_libraries(-lgcc)
 
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
-# Determine compiler install path
-execute_process(
-  COMMAND ${CMAKE_C_COMPILER} --print-file-name=.
-  OUTPUT_VARIABLE FXSDK_COMPILER_INSTALL
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+if(NOT DEFINED ENV{VXSDK_COMPILER_SYSROOT})
+  message(FATAL_ERROR "You should use the vxSDK to build this project")
+endif()
+set(VXSDK_COMPILER_INSTALL $ENV{VXSDK_COMPILER_SYSROOT})
diff --git a/vxsdk.toml b/vxsdk.toml
index 76aec72..f14a820 100644
--- a/vxsdk.toml
+++ b/vxsdk.toml
@@ -1,14 +1,26 @@
 [project]
 name    = 'fxlibc'
-version = '1.4.1'
 type    = 'app'
+target  = [
+    'superh'
+]
 
-[build]
-configure = 'cmake -DFXLIBC_PIC=1 -DFXLIBC_TARGET=vhex-sh -B build-vhex -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-vhex.cmake'
-build     = 'make -C build-vhex'
-install   = 'make -C build-vhex install'
+[superh.build]
+configure = """ \
+    cmake \
+    -B build-vhex \
+    -DFXLIBC_PIC=1 \
+    -DFXLIBC_TARGET=vhex-sh \
+    -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-vhex.cmake
+"""
+build     = 'cmake --build build-vhex'
+install   = 'cmake --install build-vhex'
 uninstall = """ \
     if [ -e build-vhex/install_manifest.txt ]; then \
         xargs rm -f < build-vhex/install_manifest.txt; \
     fi \
 """
+
+[superh.dependencies]
+vxOpenLibm  = 'master@superh'
+sh-elf-vhex = 'master@superh'