fix dedicated/unitsync build

spring · Feb 16, 2017 · 631dcfc · 631dcfc
1 parent b8bdb39
commit 631dcfc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/rts/Lua/LuaContextData.h b/rts/Lua/LuaContextData.h
@@ -201,15 +201,15 @@ struct luaContextData {
 	int  readTeam;
 	int  readAllyTeam;
 	int  selectTeam;
-
+#if (!defined(UNITSYNC) && !defined(DEDICATED))
 	LuaShaders shaders;
 	LuaTextures textures;
 	LuaFBOs fbos;
 	LuaRBOs rbos;
 	CLuaDisplayLists displayLists;
 
 	GLMatrixStateTracker glMatrixTracker;
-
+#endif
 	LuaParser* parser;
 };
 

diff --git a/rts/Lua/LuaHandle.h b/rts/Lua/LuaHandle.h
@@ -93,11 +93,13 @@ class CLuaHandle : public CEventClient
 		//FIXME needed by LuaSyncedTable (can be solved cleaner?)
 		lua_State* GetLuaState() const { return L; }
 
+#if (!defined(UNITSYNC) && !defined(DEDICATED))
 		LuaShaders& GetShaders(const lua_State* L = NULL) { return GetLuaContextData(L)->shaders; }
 		LuaTextures& GetTextures(const lua_State* L = NULL) { return GetLuaContextData(L)->textures; }
 		LuaFBOs& GetFBOs(const lua_State* L = NULL) { return GetLuaContextData(L)->fbos; }
 		LuaRBOs& GetRBOs(const lua_State* L = NULL) { return GetLuaContextData(L)->rbos; }
 		CLuaDisplayLists& GetDisplayLists(const lua_State* L = NULL) { return GetLuaContextData(L)->displayLists; }
+#endif
 
 	public: // call-ins
 		bool WantsEvent(const string& name) override { return HasCallIn(L, name); }
@@ -317,11 +319,13 @@ class CLuaHandle : public CEventClient
 		static int CallOutIsEngineMinVersion(lua_State* L);
 
 	public: // static
+#if (!defined(UNITSYNC) && !defined(DEDICATED))
 		static inline LuaShaders& GetActiveShaders(lua_State* L) { return GetLuaContextData(L)->shaders; }
 		static inline LuaTextures& GetActiveTextures(lua_State* L) { return GetLuaContextData(L)->textures; }
 		static inline LuaFBOs& GetActiveFBOs(lua_State* L) { return GetLuaContextData(L)->fbos; }
 		static inline LuaRBOs& GetActiveRBOs(lua_State* L) { return GetLuaContextData(L)->rbos; }
 		static inline CLuaDisplayLists& GetActiveDisplayLists(lua_State* L) { return GetLuaContextData(L)->displayLists; }
+#endif
 
 		static void SetDevMode(bool value) { devMode = value; }
 		static bool GetDevMode() { return devMode; }

diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
@@ -150,6 +150,7 @@ SET(engineDedicatedSources
 	${ENGINE_SRC_ROOT_DIR}/Sim/Misc/TeamBase.cpp
 	${ENGINE_SRC_ROOT_DIR}/Sim/Misc/TeamStatistics.cpp
 	${ENGINE_SRC_ROOT_DIR}/Sim/Misc/AllyTeam.cpp
+	${ENGINE_SRC_ROOT_DIR}/Lua/LuaConstEngine.cpp
 	${ENGINE_SRC_ROOT_DIR}/Lua/LuaIO.cpp
 	${ENGINE_SRC_ROOT_DIR}/Lua/LuaParser.cpp
 	${ENGINE_SRC_ROOT_DIR}/Lua/LuaUtils.cpp

diff --git a/tools/unitsync/CMakeLists.txt b/tools/unitsync/CMakeLists.txt
@@ -53,6 +53,7 @@ Include_Directories(${CMAKE_BINARY_DIR}/src-generated/engine)
 set(main_files
 	"${ENGINE_SRC_ROOT}/ExternalAI/LuaAIImplHandler.cpp"
 	"${ENGINE_SRC_ROOT}/Game/GameVersion.cpp"
+	"${ENGINE_SRC_ROOT}/Lua/LuaConstEngine.cpp"
 	"${ENGINE_SRC_ROOT}/Lua/LuaParser.cpp"
 	"${ENGINE_SRC_ROOT}/Lua/LuaUtils.cpp"
 	"${ENGINE_SRC_ROOT}/Lua/LuaIO.cpp"