LoweBowe
/
LumixEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed static build

This commit is contained in:
Mikulas Florek 2022-10-11 23:04:45 +02:00
parent 001c62d5d5
commit 824809449c
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/genie.lua
View File

@ -855,15 +855,11 @@ io.write "#elif defined LUMIX_EDITOR_PLUGINS\n"
end
io.write "#elif defined LUMIX_PLUGINS_STRINGS\n"
if _OPTIONS["dynamic-plugins"] then
local first = true
for _, plugin in ipairs(plugin_creators) do
if not first then
io.write(", ")
end
io.write("\"" .. plugin .. "\"")
io.write("\"" .. plugin .. "\", ")
first = false
end
io.write("\n")
io.write("nullptr\n")
end
io.write "#else\n"
if not _OPTIONS["dynamic-plugins"] then

1
projects/plugin.lua
View File

@ -135,7 +135,6 @@ end
function linkLib(lib)
links {lib}
for conf,conf_dir in pairs({Debug="release", RelWithDebInfo="release"}) do
for platform,target_platform in pairs({win="windows", linux="linux", }) do
configuration { "x64", conf, target_platform }

4
src/editor/studio_app.cpp
View File

@ -339,12 +339,12 @@ struct StudioAppImpl final : StudioApp
init_data.handle_file_drops = true;
init_data.window_title = "Lumix Studio";
init_data.working_dir = data_dir[0] ? data_dir : (saved_data_dir[0] ? saved_data_dir : current_dir);
const char* plugins[] = {
const char* plugins[] = {
#define LUMIX_PLUGINS_STRINGS
#include "engine/plugins.inl"
#undef LUMIX_PLUGINS_STRINGS
};
init_data.plugins = Span(plugins, plugins + lengthOf(plugins));
init_data.plugins = Span(plugins, plugins + lengthOf(plugins) - 1);
m_engine = Engine::create(static_cast<Engine::InitArgs&&>(init_data), m_allocator);
m_main_window = m_engine->getWindowHandle();
m_windows.push(m_main_window);