spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation without CELX

pull/3/head
Hleb Valoshka 2019-10-25 22:24:33 +03:00
parent 7435f420dc
commit 7c593f366f
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/celestia/CMakeLists.txt
View File

@ -34,10 +34,12 @@ elseif(_UNIX AND ENABLE_THEORA)
) )
endif() endif()
add_library(celestia STATIC ${CELESTIA_SOURCES} set(SCRIPT_LIBS $<TARGET_OBJECTS:celcommonscript> $<TARGET_OBJECTS:cellegacyscript>)
$<TARGET_OBJECTS:celcommonscript> if(ENABLE_CELX)
$<TARGET_OBJECTS:cellegacyscript> set(SCRIPT_LIBS ${SCRIPT_LIBS} $<TARGET_OBJECTS:celluascript>)
$<TARGET_OBJECTS:celluascript>) endif()
add_library(celestia STATIC ${CELESTIA_SOURCES} ${SCRIPT_LIBS})
#[[ #[[
add_library(celestia SHARED ${CELESTIA_SOURCES}) add_library(celestia SHARED ${CELESTIA_SOURCES})

4
src/celestia/celestiacore.cpp
View File

@ -146,7 +146,9 @@ CelestiaCore::CelestiaCore() :
renderer(new Renderer()), renderer(new Renderer()),
timer(new Timer()), timer(new Timer()),
m_legacyPlugin(make_unique<LegacyScriptPlugin>(this)), m_legacyPlugin(make_unique<LegacyScriptPlugin>(this)),
#ifdef CELX
m_luaPlugin(make_unique<LuaScriptPlugin>(this)), m_luaPlugin(make_unique<LuaScriptPlugin>(this)),
#endif
m_scriptMaps(make_shared<ScriptMaps>()) m_scriptMaps(make_shared<ScriptMaps>())
{ {
@ -855,7 +857,6 @@ void CelestiaCore::keyUp(int key, int)
shiftKeysPressed[key] = false; shiftKeysPressed[key] = false;
} }
#ifdef CELX
static string getKeyName(const char* c, int modifiers) static string getKeyName(const char* c, int modifiers)
{ {
unsigned int length = strlen(c); unsigned int length = strlen(c);
@ -873,7 +874,6 @@ static string getKeyName(const char* c, int modifiers)
return string(c); return string(c);
} }
#endif
void CelestiaCore::charEntered(char c, int modifiers) void CelestiaCore::charEntered(char c, int modifiers)
{ {

2
src/celestia/celestiacore.h
View File

@ -399,7 +399,9 @@ class CelestiaCore // : public Watchable<CelestiaCore>
std::unique_ptr<celestia::scripts::IScript> m_script; std::unique_ptr<celestia::scripts::IScript> m_script;
std::unique_ptr<celestia::scripts::IScriptHook> m_scriptHook; std::unique_ptr<celestia::scripts::IScriptHook> m_scriptHook;
std::unique_ptr<celestia::scripts::LegacyScriptPlugin> m_legacyPlugin; std::unique_ptr<celestia::scripts::LegacyScriptPlugin> m_legacyPlugin;
#ifdef CELX
std::unique_ptr<celestia::scripts::LuaScriptPlugin> m_luaPlugin; std::unique_ptr<celestia::scripts::LuaScriptPlugin> m_luaPlugin;
#endif
std::shared_ptr<celestia::scripts::ScriptMaps> m_scriptMaps; std::shared_ptr<celestia::scripts::ScriptMaps> m_scriptMaps;
enum ScriptState enum ScriptState