From: Thomas Debesse Date: Sat, 14 Jan 2023 18:19:12 +0000 (+0100) Subject: tools: remove daemonmap X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf668aad10e8e652c1137524e358c17b007af02d;p=xonotic%2Fnetradiant.git tools: remove daemonmap --- diff --git a/.gitmodules b/.gitmodules index f8d6fc74..d20f6e35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "libs/crunch"] path = libs/crunch url = https://github.com/DaemonEngine/crunch.git -[submodule "tools/unvanquished/daemonmap"] - path = tools/unvanquished/daemonmap - url = https://github.com/DaemonEngine/daemonmap.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c2d795c8..cd615d48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,12 +53,6 @@ else () set(DEFAULT_BUILD_CRUNCH OFF CACHE INTERNAL "...") endif () -if (EXISTS "${PROJECT_SOURCE_DIR}/tools/unvanquished/daemonmap/tools/quake3/q3map2/main.c") - set(DEFAULT_BUILD_DAEMONMAP ON CACHE INTERNAL "...") -else () - set(DEFAULT_BUILD_DAEMONMAP OFF CACHE INTERNAL "...") -endif () - #----------------------------------------------------------------------- # Build options #----------------------------------------------------------------------- @@ -66,7 +60,6 @@ endif () option(BUILD_RADIANT "Build the GUI" ON) option(BUILD_TOOLS "Build the tools" ON) option(BUILD_CRUNCH "Build Crunch image support" ${DEFAULT_BUILD_CRUNCH}) -option(BUILD_DAEMONMAP "Build daemonmap navigation mesh generator" ${DEFAULT_BUILD_DAEMONMAP}) option(DOWNLOAD_GAMEPACKS "Download game packs" ON) option(USE_WERROR "Build with -Werror -pedantic-errors" OFF) option(FHS_INSTALL "Install according to Filesystem Hierarchy Standard" OFF) diff --git a/README.md b/README.md index 33954233..b6874154 100644 --- a/README.md +++ b/README.md @@ -205,8 +205,6 @@ Options: Do not build NetRadiant (default: `ON`, build netradiant graphical editor); * `BUILD_TOOLS=OFF` Do not build q3map2 and other tools (default: `ON`, build command line tools); -* `BUILD_DAEMONMAP=OFF` - Do not build daemonmap tool (default: `ON` if submodule is there, buils daemonmap navigation mesh generator); * `BUILD_CRUNCH=OFF` Disable crunch support (default: `ON` if submodule is there, enable crunch support); * `RADIANT_ABOUTMSG="Custom build by $(whoami)"` @@ -224,8 +222,6 @@ Targets: * `quake3` Compile all the Quake 3 tools: - `q3map2` Compile the Quake 3 map compiler; - `q3data` Compile the q3data tool; - * `unvanquished` Compile all the Unvanquished tools: `daemonmap`, `q3map3`, `q4data`; - - `daemonmap` Compile the daemonmap navigation mesh generator. Type `make help` to get an exhaustive list of targets. diff --git a/easy-builder b/easy-builder index 220649fd..47020d2d 100755 --- a/easy-builder +++ b/easy-builder @@ -94,8 +94,7 @@ do done declare -a fetch_submodules_cmd -for submodule_file in 'libs/crunch/inc/crn_decomp.h' \ - 'tools/unvanquished/daemonmap/tools/quake3/q3map2/main.c' +for submodule_file in 'libs/crunch/inc/crn_decomp.h' do if ! [ -f "${project_source_dir}/${submodule_file}" ] then diff --git a/flake.nix b/flake.nix index cdfed9f4..63ed6c57 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ "-DDOWNLOAD_GAMEPACKS=OFF" "-DBUNDLE_LIBRARIES=OFF" "-DBUILD_CRUNCH=OFF" - "-DBUILD_DAEMONMAP=OFF" "-DBUILD_RADIANT=OFF" "-DBUILD_TOOLS=ON" "-DFHS_INSTALL=ON" diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 6e30389c..b8f85654 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -6,5 +6,3 @@ add_subdirectory(quake3) add_custom_target(tools) add_dependencies(tools quake2 heretic2 quake3) - -add_subdirectory(unvanquished) diff --git a/tools/unvanquished/CMakeLists.txt b/tools/unvanquished/CMakeLists.txt deleted file mode 100644 index ed9ed821..00000000 --- a/tools/unvanquished/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -if (BUILD_DAEMONMAP) - # Always keep daemonmap libs/ - # up-to-date with NetRadiant libs/ - include_directories(daemonmap/libs) - include_directories(daemonmap/tools) - - add_subdirectory(daemonmap/libs) - add_subdirectory(daemonmap/tools) -endif() diff --git a/tools/unvanquished/daemonmap b/tools/unvanquished/daemonmap deleted file mode 160000 index f063894e..00000000 --- a/tools/unvanquished/daemonmap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f063894efd86504c9d9fa3e248ee1c95395f7951