Inlcude protobuf for later usage.
Not sure if it's implemented correctly, but we'll see that tomorrow :P
This commit is contained in:
parent
d87a6ced42
commit
790bcb2474
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -17,3 +17,6 @@
|
|||||||
[submodule "deps/libtommath"]
|
[submodule "deps/libtommath"]
|
||||||
path = deps/libtommath
|
path = deps/libtommath
|
||||||
url = https://github.com/libtom/libtommath.git
|
url = https://github.com/libtom/libtommath.git
|
||||||
|
[submodule "deps/protobuf"]
|
||||||
|
path = deps/protobuf
|
||||||
|
url = https://github.com/google/protobuf.git
|
||||||
|
1
deps/protobuf
vendored
Submodule
1
deps/protobuf
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit bc215089ca7d9da3a2b313b250d1dee665eda438
|
36
premake5.lua
36
premake5.lua
@ -100,7 +100,7 @@ workspace "iw4x"
|
|||||||
buildoptions { "-Zm88" }
|
buildoptions { "-Zm88" }
|
||||||
|
|
||||||
-- Dependency on zlib, json11 and asio
|
-- Dependency on zlib, json11 and asio
|
||||||
links { "zlib", "json11", "pdcurses", "libtomcrypt", "libtommath" }
|
links { "zlib", "json11", "pdcurses", "libtomcrypt", "libtommath", "protobuf" }
|
||||||
includedirs
|
includedirs
|
||||||
{
|
{
|
||||||
"./deps/zlib",
|
"./deps/zlib",
|
||||||
@ -109,6 +109,7 @@ workspace "iw4x"
|
|||||||
"./deps/asio/asio/include",
|
"./deps/asio/asio/include",
|
||||||
"./deps/libtomcrypt/src/headers",
|
"./deps/libtomcrypt/src/headers",
|
||||||
"./deps/libtommath",
|
"./deps/libtommath",
|
||||||
|
"./deps/protobuf/src",
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Virtual paths
|
-- Virtual paths
|
||||||
@ -246,3 +247,36 @@ workspace "iw4x"
|
|||||||
|
|
||||||
-- always build as static lib, as pdcurses doesn't export anything
|
-- always build as static lib, as pdcurses doesn't export anything
|
||||||
kind "StaticLib"
|
kind "StaticLib"
|
||||||
|
|
||||||
|
-- protobuf
|
||||||
|
project "protobuf"
|
||||||
|
language "C++"
|
||||||
|
links { "zlib" }
|
||||||
|
defines { "_SCL_SECURE_NO_WARNINGS" }
|
||||||
|
includedirs
|
||||||
|
{
|
||||||
|
"./deps/zlib",
|
||||||
|
"./deps/protobuf/src",
|
||||||
|
}
|
||||||
|
|
||||||
|
files { "./deps/protobuf/src/**.cc" }
|
||||||
|
|
||||||
|
-- remove unnecessary sources
|
||||||
|
removefiles
|
||||||
|
{
|
||||||
|
"./deps/protobuf/src/**/*test.cc",
|
||||||
|
"./deps/protobuf/src/google/protobuf/*test*.cc",
|
||||||
|
|
||||||
|
"./deps/protobuf/src/google/protobuf/testing/**.cc",
|
||||||
|
"./deps/protobuf/src/google/protobuf/compiler/**.cc",
|
||||||
|
|
||||||
|
"./deps/protobuf/src/google/protobuf/arena_nc.cc",
|
||||||
|
"./deps/protobuf/src/google/protobuf/util/internal/error_listener.cc",
|
||||||
|
"./deps/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
|
||||||
|
}
|
||||||
|
|
||||||
|
-- not our code, ignore POSIX usage warnings for now
|
||||||
|
warnings "Off"
|
||||||
|
|
||||||
|
-- always build as static lib, as pdcurses doesn't export anything
|
||||||
|
kind "StaticLib"
|
||||||
|
Loading…
Reference in New Issue
Block a user