Changeset View
Changeset View
Standalone View
Standalone View
build/premake/premake4.lua
| Show First 20 Lines • Show All 577 Lines • ▼ Show 20 Lines | function setup_all_libs () | ||||
| source_dirs = { | source_dirs = { | ||||
| "network", | "network", | ||||
| } | } | ||||
| extern_libs = { | extern_libs = { | ||||
| "spidermonkey", | "spidermonkey", | ||||
| "enet", | "enet", | ||||
| "boost", -- dragged in via server->simulation.h->random | "boost", -- dragged in via server->simulation.h->random | ||||
| } | } | ||||
elexis: Is that actually related to the NAT patch? | |||||
Not Done Inline ActionsIt's for SDL_Delay (the only cross-platform sleep method I was able to find in our codebase) in StunClient.cpp and NetServer.cpp, there may be a better alternative, but I didn't find it yet fcxSanya: It's for `SDL_Delay` (the only cross-platform sleep method I was able to find in our codebase)… | |||||
Not Done Inline Actionsboost and C++11 have this_thread::sleep_for, but I'm not sure that VS2013 compiles the last one. vladislavbelov: boost and C++11 have this_thread::sleep_for, but I'm not sure that VS2013 compiles the last one. | |||||
Not Done Inline Actions
Changed it to C++11'th this_thread::sleep_for in ee4e8b1, seems to compile fine in VS2013. Thanks for the hint! fcxSanya: > boost and C++11 have this_thread::sleep_for, but I'm not sure that VS2013 compiles the last… | |||||
| if not _OPTIONS["without-miniupnpc"] then | if not _OPTIONS["without-miniupnpc"] then | ||||
| table.insert(extern_libs, "miniupnpc") | table.insert(extern_libs, "miniupnpc") | ||||
| end | end | ||||
| setup_static_lib_project("network", source_dirs, extern_libs, {}) | setup_static_lib_project("network", source_dirs, extern_libs, {}) | ||||
| source_dirs = { | source_dirs = { | ||||
| "third_party/tinygettext/src", | "third_party/tinygettext/src", | ||||
| } | } | ||||
| Show All 23 Lines | source_dirs = { | ||||
| "lobby/scripting", | "lobby/scripting", | ||||
| "i18n", | "i18n", | ||||
| "third_party/encryption" | "third_party/encryption" | ||||
| } | } | ||||
| extern_libs = { | extern_libs = { | ||||
| "spidermonkey", | "spidermonkey", | ||||
| "boost", | "boost", | ||||
| "enet", | |||||
| "gloox", | "gloox", | ||||
| "icu", | "icu", | ||||
| "iconv", | "iconv", | ||||
| "tinygettext" | "tinygettext" | ||||
| } | } | ||||
| setup_static_lib_project("lobby", source_dirs, extern_libs, {}) | setup_static_lib_project("lobby", source_dirs, extern_libs, {}) | ||||
| if _OPTIONS["use-shared-glooxwrapper"] and not _OPTIONS["build-shared-glooxwrapper"] then | if _OPTIONS["use-shared-glooxwrapper"] and not _OPTIONS["build-shared-glooxwrapper"] then | ||||
| ▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Lines | source_dirs = { | ||||
| "gui/scripting", | "gui/scripting", | ||||
| "i18n" | "i18n" | ||||
| } | } | ||||
| extern_libs = { | extern_libs = { | ||||
| "spidermonkey", | "spidermonkey", | ||||
| "sdl", -- key definitions | "sdl", -- key definitions | ||||
| "opengl", | "opengl", | ||||
| "boost", | "boost", | ||||
| "enet", | |||||
| "tinygettext", | "tinygettext", | ||||
| "icu", | "icu", | ||||
| "iconv", | "iconv", | ||||
| } | } | ||||
| if not _OPTIONS["without-audio"] then | if not _OPTIONS["without-audio"] then | ||||
| table.insert(extern_libs, "openal") | table.insert(extern_libs, "openal") | ||||
| end | end | ||||
| setup_static_lib_project("gui", source_dirs, extern_libs, {}) | setup_static_lib_project("gui", source_dirs, extern_libs, {}) | ||||
| ▲ Show 20 Lines • Show All 705 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator
Is that actually related to the NAT patch?