diff --git a/.gitmodules b/.gitmodules index e9a27958..1f0d4762 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,14 +22,6 @@ path = deps/mongoose url = https://github.com/cesanta/mongoose.git branch = master -[submodule "deps/fmt"] - path = deps/fmt - url = https://github.com/fmtlib/fmt.git - branch = master -[submodule "deps/Wink-Signals"] - path = deps/Wink-Signals - url = https://github.com/miguelmartin75/Wink-Signals.git - branch = master [submodule "deps/bitmrc"] path = deps/bitmrc url = git@github.com:iw4x-dev-urandom/BitMRC.git diff --git a/deps/Wink-Signals b/deps/Wink-Signals deleted file mode 160000 index 3ec051c1..00000000 --- a/deps/Wink-Signals +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ec051c1efa4e09cf6508a902e296a95352cebb9 diff --git a/deps/fmt b/deps/fmt deleted file mode 160000 index e0251fdc..00000000 --- a/deps/fmt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0251fdcefcde75641ba359d535438691be8e1eb diff --git a/premake/fmt.lua b/premake/fmt.lua deleted file mode 100644 index a7965277..00000000 --- a/premake/fmt.lua +++ /dev/null @@ -1,44 +0,0 @@ -fmt = { - settings = nil -} - -function fmt.setup(settings) - if not settings.source then error("Missing source.") end - - fmt.settings = settings -end - -function fmt.import() - if not fmt.settings then error("Run fmt.setup first") end - - links { "fmt" } - fmt.includes() -end - -function fmt.includes() - if not fmt.settings then error("Run fmt.setup first") end - - includedirs { fmt.settings.source } -end - -function fmt.project() - if not fmt.settings then error("Run fmt.setup first") end - - project "fmt" - language "C++" - - fmt.includes() - - files - { - path.join(fmt.settings.source, "fmt/*.cc"), - path.join(fmt.settings.source, "fmt/*.h"), - } - - -- not our code, ignore POSIX usage warnings for now - warnings "Off" - - defines { "_LIB" } - removedefines { "_USRDLL", "_DLL" } - kind "StaticLib" -end diff --git a/premake/winksignals.lua b/premake/winksignals.lua deleted file mode 100644 index f8ba41e6..00000000 --- a/premake/winksignals.lua +++ /dev/null @@ -1,27 +0,0 @@ -winksignals = { - settings = nil, -} - -function winksignals.setup(settings) - if not settings.source then error("Missing source.") end - - winksignals.settings = settings -end - -function winksignals.import() - if not winksignals.settings then error("Run winksignals.setup first") end - - winksignals.includes() -end - -function winksignals.includes() - if not winksignals.settings then error("Run winksignals.setup first") end - - includedirs { winksignals.settings.source } -end - -function winksignals.project() - if not winksignals.settings then error("Run winksignals.setup first") end - - -- Wink-Signals is header-only, so no project files needed for this -end diff --git a/premake5.lua b/premake5.lua index c7e774ff..6dcad54f 100644 --- a/premake5.lua +++ b/premake5.lua @@ -190,7 +190,6 @@ depsBasePath = "./deps" require "premake/base128" require "premake/bitmrc" -require "premake/fmt" require "premake/json11" require "premake/libcryptopp" require "premake/libtomcrypt" @@ -199,7 +198,6 @@ require "premake/mongoose" require "premake/pdcurses" require "premake/protobuf" require "premake/sqlite3" -require "premake/winksignals" require "premake/zlib" base128.setup @@ -210,10 +208,6 @@ bitmrc.setup { source = path.join(depsBasePath, "bitmrc"), } -fmt.setup -{ - source = path.join(depsBasePath, "fmt"), -} json11.setup { source = path.join(depsBasePath, "json11"), @@ -254,10 +248,6 @@ sqlite3.setup { source = path.join(depsBasePath, "bitmrc/windows/sqlite3"), } -winksignals.setup -{ - source = path.join(depsBasePath, "Wink-Signals"), -} zlib.setup { defines = { @@ -365,14 +355,12 @@ workspace "iw4x" if not _OPTIONS["disable-base128"] then base128.import() end - fmt.import() json11.import() libtomcrypt.import() libtommath.import() mongoose.import() pdcurses.import() protobuf.import() - winksignals.import() zlib.import() -- fix vpaths for protobuf sources @@ -484,14 +472,12 @@ workspace "iw4x" if not _OPTIONS["disable-base128"] then base128.project() end - fmt.project() json11.project() libtomcrypt.project() libtommath.project() mongoose.project() pdcurses.project() protobuf.project() - winksignals.project() zlib.project() rule "ProtobufCompiler"