From f382f97253aeb5073dc150401571d95d255a856e Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 9 Oct 2018 10:55:48 +0200 Subject: [PATCH] Revert "[Submodules] Add DHT" --- .gitmodules | 3 --- deps/dht | 1 - premake/dht.lua | 44 -------------------------------------------- premake5.lua | 7 ------- 4 files changed, 55 deletions(-) delete mode 160000 deps/dht delete mode 100644 premake/dht.lua diff --git a/.gitmodules b/.gitmodules index 5cca93cf..41f1970e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,6 +32,3 @@ [submodule "deps/iw4mvm"] path = deps/iw4mvm url = ../../luckyy/IW4MVM_IW4X.git -[submodule "deps/dht"] - path = deps/dht - url = ../dht.git diff --git a/deps/dht b/deps/dht deleted file mode 160000 index 54ee76af..00000000 --- a/deps/dht +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 54ee76af630f56cb97646bc770b88bfb592fd328 diff --git a/premake/dht.lua b/premake/dht.lua deleted file mode 100644 index 2affec75..00000000 --- a/premake/dht.lua +++ /dev/null @@ -1,44 +0,0 @@ -dht = { - settings = nil -} - -function dht.setup(settings) - if not settings.source then error("Missing source.") end - - dht.settings = settings - - if not dht.settings.defines then dht.settings.defines = {} end -end - -function dht.import() - if not dht.settings then error("You need to call dht.setup first") end - - links { "dht" } - dht.includes() -end - -function dht.includes() - if not dht.settings then error("You need to call dht.setup first") end - - includedirs { dht.settings.source } - defines(dht.settings.defines) -end - -function dht.project() - if not dht.settings then error("You need to call dht.setup first") end - - project "dht" - language "C" - - dht.includes() - files - { - path.join(dht.settings.source, "dht.h"), - path.join(dht.settings.source, "dht.c"), - } - - -- not our code, ignore POSIX usage warnings for now - warnings "Off" - - kind "StaticLib" -end \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index 2781c9e0..117fa075 100644 --- a/premake5.lua +++ b/premake5.lua @@ -182,7 +182,6 @@ require "premake/protobuf" require "premake/zlib" require "premake/udis86" require "premake/iw4mvm" -require "premake/dht" json11.setup { @@ -237,10 +236,6 @@ iw4mvm.setup }, source = path.join(depsBasePath, "iw4mvm"), } -dht.setup -{ - source = path.join(depsBasePath, "dht"), -} workspace "iw4x" location "./build" @@ -333,7 +328,6 @@ workspace "iw4x" zlib.import() udis86.import() iw4mvm.import() - dht.import() -- fix vpaths for protobuf sources vpaths @@ -447,7 +441,6 @@ workspace "iw4x" zlib.project() udis86.project() iw4mvm.project() - dht.project() workspace "*" buildoptions {