Update Godot Sandbox to use improved CMake script

libriscv · Dec 10, 2024 · 4bbffbf · 4bbffbf
1 parent 962f524
commit 4bbffbf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,18 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
 project (godot-sandbox-programs)
 
-option(USE_MOLD  "Build with MOLD" OFF)
-option(STRIPPED  "Strip executables" OFF)
-
-if (${CMAKE_C_COMPILER} MATCHES "riscv64-unknown-elf*")
-	set(EMBEDDED_RISCV 1)
-	message(STATUS "Building for embedded RISC-V")
-elseif (${CMAKE_C_COMPILER} MATCHES "zig")
-	set(ZIG_COMPILER 1)
-	message(STATUS "Building using zig c++")
-	add_library(atomic STATIC "${CMAKE_SOURCE_DIR}/ext/atomic.c")
-	link_directories("${CMAKE_BINARY_DIR}")
-endif()
-
 add_subdirectory(ext)
 add_subdirectory(programs)
diff --git a/ext/godot-sandbox b/ext/godot-sandbox
diff --git a/programs/robust_skin_weight_transfer/robust_weight_transfer.cpp b/programs/robust_skin_weight_transfer/robust_weight_transfer.cpp
@@ -429,7 +429,7 @@ bool test_inpaint() {
 							0.0357143 , 0.964286;
 
 	Eigen::MatrixXd W_inpainted(4, 2);
-	
+
 	bool success = inpaint(V2, F2, W2, Matched, W_inpainted);
 	std::cout << "Inpainted Weights:\n" << W_inpainted << std::endl;
 	std::cout << "Expected Inpainted Weights:\n" << expected_W_inpainted << std::endl;
@@ -890,10 +890,10 @@ static Variant run_tests() {
 	}
 	if (all_tests_passed) {
 		std::cout << "All tests passed!" << std::endl;
-		return Variant(0);
+		return 0;
 	} else {
 		std::cerr << "Some tests failed." << std::endl;
-		return Variant(1);
+		return 1;
 	}
 }
+1 −1		ext/libriscv
+18 −0		program/cpp/cmake/CMakeLists.txt
+0 −0		program/cpp/cmake/atomic.c
+8 −0		program/cpp/project/CMakeLists.txt
+113 −0		program/cpp/project/README.md
+55 −0		program/cpp/project/build.sh
+41 −0		program/cpp/project/src/program.cpp
+10 −1		src/sandbox.cpp