diff --git a/.gitmodules b/.gitmodules index ccba2999..c919986a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,6 @@ [submodule "deps/json11"] path = deps/json11 url = https://github.com/dropbox/json11.git +[submodule "deps/asio"] + path = deps/asio + url = https://github.com/chriskohlhoff/asio.git diff --git a/deps/asio b/deps/asio new file mode 160000 index 00000000..722f7e2b --- /dev/null +++ b/deps/asio @@ -0,0 +1 @@ +Subproject commit 722f7e2be05a51c69644662ec514d6149b2b7ef8 diff --git a/premake5.lua b/premake5.lua index 039fcc29..eda4932d 100644 --- a/premake5.lua +++ b/premake5.lua @@ -86,9 +86,9 @@ workspace "iw4x" pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives pchsource "src/STDInclude.cpp" -- real path - -- Dependency on zlib + -- Dependency on zlib, json11 and asio links { "zlib", "json11" } - includedirs { "./deps/zlib", "./deps/json11" } + includedirs { "./deps/zlib", "./deps/json11", "./deps/asio/asio/include" } -- Virtual paths if not _OPTIONS["no-new-structure"] then diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index 200da516..4766d6fd 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -30,7 +30,9 @@ // Submodules #define ZLIB_CONST +#define ASIO_STANDALONE #include +#include #include // Version number