Skip to content

Commit

Permalink
WIP: dprectool
Browse files Browse the repository at this point in the history
  • Loading branch information
askmeaboutlo0m committed Aug 30, 2023
1 parent 531e627 commit 1ee3ebc
Show file tree
Hide file tree
Showing 13 changed files with 544 additions and 67 deletions.
10 changes: 9 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down Expand Up @@ -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
Expand Down
296 changes: 296 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[workspace]
members = []
resolver = "2"
members = [
"src/drawdance/rust",
"src/tools/dprectool",
]

[workspace.package]
version = "2.2.0-pre"
Expand Down
Loading

0 comments on commit 1ee3ebc

Please sign in to comment.