WIP: dprectool

drawpile · Aug 31, 2023 · b41e10c · b41e10c
1 parent 531e627
commit b41e10c
Show file tree

Hide file tree

Showing 35 changed files with 1,273 additions and 101 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,6 +86,13 @@ endif()
 message(STATUS "Project version: ${PROJECT_VERSION}")
 message(STATUS "Protocol version: ${DRAWPILE_PROTO_SERVER_VERSION}.${DRAWPILE_PROTO_MAJOR_VERSION}.${DRAWPILE_PROTO_MINOR_VERSION}")
 
+if(TOOLS)
+	set(RUST_LIBS ON)
+	include(Cargo)
+else()
+	set(RUST_LIBS OFF)
+endif()
+
 # https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html
 find_package(QT ${DP_MIN_QT_VERSION} NAMES Qt6 Qt5 REQUIRED)
 message(STATUS "Using Qt version ${QT_VERSION_MAJOR}")
@@ -195,7 +202,8 @@ if(SERVER)
 endif()
 
 if(TOOLS)
-	message(STATUS "Someone deleted the tools")
+	message(STATUS "Adding tools")
+	add_subdirectory(src/tools)
 endif()
 
 # This must run once all target creation is finished since it walks the list of

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,9 @@
 [workspace]
-members = []
+resolver = "2"
+members = [
+    "src/drawdance/rust",
+    "src/tools/dprectool",
+]
 
 [workspace.package]
 version = "2.2.0-pre"