Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Include official boost-free asio module.

Browse Source
This commit is contained in:
momo5502 2016-01-14 12:33:11 +01:00
parent 5f0cfd7a19
commit 0a201daee0
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -5,3 +5,6 @@
[submodule "deps/json11"] [submodule "deps/json11"]
path = deps/json11 path = deps/json11
url = https://github.com/dropbox/json11.git url = https://github.com/dropbox/json11.git
[submodule "deps/asio"]
path = deps/asio
url = https://github.com/chriskohlhoff/asio.git

1
deps/asio vendored Submodule

@ -0,0 +1 @@
Subproject commit 722f7e2be05a51c69644662ec514d6149b2b7ef8

4
premake5.lua
View File

@ -86,9 +86,9 @@ workspace "iw4x"
pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives
pchsource "src/STDInclude.cpp" -- real path pchsource "src/STDInclude.cpp" -- real path
-- Dependency on zlib -- Dependency on zlib, json11 and asio
links { "zlib", "json11" } links { "zlib", "json11" }
includedirs { "./deps/zlib", "./deps/json11" } includedirs { "./deps/zlib", "./deps/json11", "./deps/asio/asio/include" }
-- Virtual paths -- Virtual paths
if not _OPTIONS["no-new-structure"] then if not _OPTIONS["no-new-structure"] then

2
src/STDInclude.hpp
View File

@ -30,7 +30,9 @@
// Submodules // Submodules
#define ZLIB_CONST #define ZLIB_CONST
#define ASIO_STANDALONE
#include <zlib.h> #include <zlib.h>
#include <asio.hpp>
#include <json11.hpp> #include <json11.hpp>
// Version number // Version number