diff options
Diffstat (limited to 'Editor')
-rw-r--r-- | Editor/EditorMain.cpp | 7 | ||||
-rw-r--r-- | Editor/Path.cpp | 0 | ||||
-rw-r--r-- | Editor/Path.h | 0 | ||||
-rw-r--r-- | Editor/Scripting/Editor/EditorApplication.bind.cpp | 2 | ||||
-rw-r--r-- | Editor/Scripting/EditorScripting.cpp | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp index 88f7513..182a2c4 100644 --- a/Editor/EditorMain.cpp +++ b/Editor/EditorMain.cpp @@ -31,11 +31,8 @@ void InitLuaState() std::string workingDir = Win::GetCurrentWorkingDirectory();
Win::SetDllSearchDirectory(workingDir);
- // set search path
- state.DoString(R"(package.path=package.path .. ";" .. ".\\Libraries\\?.lua")");
- state.DoString(R"(package.cpath=package.cpath .. ";" .. ".\\Libraries\\?.dll")");
-
- state.DoFile(".\\Scripts\\EditorApplication.lua", ErrorHandle);
+ state.DoFile("./boot.lua", ErrorHandle);
+ state.DoFile("./Scripts/EditorApplication.lua", ErrorHandle);
}
#ifdef GAMELAB_DEBUG
diff --git a/Editor/Path.cpp b/Editor/Path.cpp deleted file mode 100644 index e69de29..0000000 --- a/Editor/Path.cpp +++ /dev/null diff --git a/Editor/Path.h b/Editor/Path.h deleted file mode 100644 index e69de29..0000000 --- a/Editor/Path.h +++ /dev/null diff --git a/Editor/Scripting/Editor/EditorApplication.bind.cpp b/Editor/Scripting/Editor/EditorApplication.bind.cpp index 33d73f7..184870a 100644 --- a/Editor/Scripting/Editor/EditorApplication.bind.cpp +++ b/Editor/Scripting/Editor/EditorApplication.bind.cpp @@ -3,7 +3,7 @@ LUA_BIND_REGISTRY(EditorApplication) { LUA_BIND_REGISTER_METHODS(state, - {"New", EditorApplication::_New}, + { "New", _New}, { "SetMainWindow", _SetMainWindow }, { "PullMessage", _PullMessage } ); diff --git a/Editor/Scripting/EditorScripting.cpp b/Editor/Scripting/EditorScripting.cpp index bb53848..26509e0 100644 --- a/Editor/Scripting/EditorScripting.cpp +++ b/Editor/Scripting/EditorScripting.cpp @@ -3,6 +3,7 @@ extern int luaopen_GameLab_Debug(lua_State* L); // GameLab.Debug extern int luaopen_GameLab_IO(lua_State* L); // GameLab.IO +extern int luaopen_GameLab_Path(lua_State* L); // GameLab.Path extern int luaopen_GameLab_Engine(lua_State* L); // GameLab.Engine extern int luaopen_GameLab_Engine_Rendering(lua_State* L); // GameLab.Engine.Rendering @@ -31,7 +32,8 @@ bool SetupGameLabEditorScripting(lua_State* L) { log_info("Scripting", "SetupGameLabEditorScripting()"); - openlib(luaopen_GameLab_Debug); + openlib(luaopen_GameLab_Debug); + openlib(luaopen_GameLab_Path); openlib(luaopen_GameLab_Editor); openlib(luaopen_GameLab_Editor_GUI); |