From a845570fefdb7d2c385bd3fc49f6c91d06aac5a9 Mon Sep 17 00:00:00 2001 From: janwas Date: Sat, 31 May 2008 20:00:37 +0000 Subject: [PATCH] add enet to external library definitions and add it as a dependency of the network and engine subsystems. (required for dacian's new netcode) warning: enet isn't yet compiled on OS X and linux This was SVN commit r5997. --- build/premake/extern_libs.lua | 6 ++++++ build/premake/premake.lua | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua index a642366ab9..c971c86fb0 100644 --- a/build/premake/extern_libs.lua +++ b/build/premake/extern_libs.lua @@ -79,6 +79,12 @@ extern_lib_defs = { directx = { dbg_suffix = "", }, + enet = + { + win_names = { "enet" }, + unix_names = { "enet" }, -- TODO: ensure this works on unix + dbg_suffix = "_dbg", + }, fcollada = { win_names = { "FCollada" }, unix_names = { "FColladaSD" }, diff --git a/build/premake/premake.lua b/build/premake/premake.lua index a649821fae..d60363fc4e 100755 --- a/build/premake/premake.lua +++ b/build/premake/premake.lua @@ -315,6 +315,7 @@ function setup_all_libs () extern_libs = { "spidermonkey", "xerces", + "enet", "boost", -- dragged in via server->simulation.h->random } setup_static_lib_package("network", source_dirs, extern_libs, {}) @@ -331,7 +332,7 @@ function setup_all_libs () "sound", "scripting", "maths", - "maths/scripting" + "maths/scripting", } extern_libs = { "spidermonkey", @@ -339,7 +340,8 @@ function setup_all_libs () "xerces", "opengl", "zlib", - "boost" + "boost", + "enet", } setup_static_lib_package("engine", source_dirs, extern_libs, {}) @@ -348,14 +350,12 @@ function setup_all_libs () "graphics", "graphics/scripting", "renderer" - } extern_libs = { "opengl", "sdl", -- key definitions "spidermonkey", -- for graphics/scripting "boost" - } setup_static_lib_package("graphics", source_dirs, extern_libs, {}) @@ -376,14 +376,12 @@ function setup_all_libs () source_dirs = { "tools/atlas/GameInterface", "tools/atlas/GameInterface/Handlers" - } extern_libs = { "boost", "sdl", -- key definitions "opengl", "spidermonkey" - } setup_static_lib_package("atlas", source_dirs, extern_libs, {}) @@ -471,7 +469,8 @@ used_extern_libs = { "dbghelp", "cxxtest", "directx", - "comsuppw" + "comsuppw", + "enet" } -- Bundles static libs together with main.cpp and builds game executable.