Merge remote-tracking branch 'origin/master' into d3d12

This commit is contained in:
gibbed
2019-08-02 10:00:36 -05:00
10 changed files with 170 additions and 0 deletions

1
third_party/discord-rpc vendored Submodule

Submodule third_party/discord-rpc added at ba9fe00c4d

37
third_party/discord-rpc.lua vendored Normal file
View File

@@ -0,0 +1,37 @@
group("third_party")
project("discord-rpc")
uuid("012f6131-efc0-4abd-852d-a33640732d4c")
kind("StaticLib")
language("C++")
links({
})
defines({
"_LIB",
})
includedirs({
"discord-rpc/include",
"rapidjson/include"
})
files({
"discord-rpc/src/connection.h",
"discord-rpc/src/discord_rpc.cpp",
"discord-rpc/src/msg_queue.h",
"discord-rpc/src/rpc_connection.cpp",
"discord-rpc/src/rpc_connection.h",
"discord-rpc/src/serialization.cpp",
"discord-rpc/src/serialization.h"
})
filter("platforms:Linux")
files({
"discord-rpc/src/connection_unix.cpp",
"discord-rpc/src/discord_register_linux.cpp"
})
filter("platforms:Mac")
files({
"discord-rpc/src/discord_register_osx.m"
})
filter("platforms:Windows")
files({
"discord-rpc/src/connection_win.cpp",
"discord-rpc/src/discord_register_win.cpp"
})

1
third_party/rapidjson vendored Submodule

Submodule third_party/rapidjson added at af223d44f4