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

View File

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

View File

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

View File

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