From 683be5b374caa6878a596ed280f2ec209ef3c53f Mon Sep 17 00:00:00 2001
From: Yilin Sun <imi415@imi.moe>
Date: Fri, 3 Mar 2023 11:55:28 +0800
Subject: [PATCH] Updated build configurations.

Signed-off-by: Yilin Sun <imi415@imi.moe>
---
 .gitignore                             | 2 +-
 CMakeLists.txt                         | 8 +++++++-
 configs/{imxrt1xxx.rb => imxrt1052.rb} | 2 +-
 configs/{lpc5500.rb => lpc55s69.rb}    | 8 +++-----
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename configs/{imxrt1xxx.rb => imxrt1052.rb} (97%)
 rename configs/{lpc5500.rb => lpc55s69.rb} (91%)

diff --git a/.gitignore b/.gitignore
index 66cfef8..f2e0a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/config/*.lock
+/configs/*.lock
 /build
 /cmake-build-*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c45373..4b133dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ add_custom_command(OUTPUT libmruby.a
     COMMAND "${CMAKE_COMMAND}" "-E" "env"
             "MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/configs/${MRUBY_MCUX_TARGET}.rb"
 	    "MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby"
+	    "INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby/bin"
             "./minirake"
 
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/mruby"
@@ -25,4 +26,9 @@ set_target_properties(mruby PROPERTIES
 )
 
 add_library(${PROJECT_NAME} INTERFACE)
-target_link_libraries(${PROJECT_NAME} INTERFACE mruby)
+target_link_libraries(${PROJECT_NAME} INTERFACE
+    "mruby"
+    "mruby_core"
+)
+target_link_directories(${PROJECT_NAME} INTERFACE
+    "${CMAKE_CURRENT_BINARY_DIR}/mruby/${MRUBY_MCUX_TARGET}/lib"
diff --git a/configs/imxrt1xxx.rb b/configs/imxrt1052.rb
similarity index 97%
rename from configs/imxrt1xxx.rb
rename to configs/imxrt1052.rb
index 6d872e1..352110e 100644
--- a/configs/imxrt1xxx.rb
+++ b/configs/imxrt1052.rb
@@ -1,6 +1,6 @@
 # Cross Compiling configuration for i.MXRT 1xxx (Cortex-M7)
 
-MRuby::CrossBuild.new("imxrt1xxx") do |conf|
+MRuby::CrossBuild.new("imxrt1052") do |conf|
   toolchain :gcc
 
   conf.cc do |cc|
diff --git a/configs/lpc5500.rb b/configs/lpc55s69.rb
similarity index 91%
rename from configs/lpc5500.rb
rename to configs/lpc55s69.rb
index 68193bd..6eb01da 100644
--- a/configs/lpc5500.rb
+++ b/configs/lpc55s69.rb
@@ -1,8 +1,6 @@
-# Cross Compiling configuration for RX630
-# http://gadget.renesas.com/
-#
-# Requires gnurx_v14.03
-MRuby::CrossBuild.new("lpc5500") do |conf|
+# Cross Compiling configuration for LPC55S69 (Core 0)
+
+MRuby::CrossBuild.new("lpc55s69") do |conf|
   toolchain :gcc
 
   conf.cc do |cc|