Errors from merge fixed

4 years ago · c0a74d7903
parent 564f3e8efe
commit c0a74d7903
3 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -192,7 +192,7 @@ target_link_directories(${PROJECT_NAME}
    PRIVATE external/box2d/bin
 )
-target_link_libraries(${PROJECT_NAME} box2d glfw glad glm dearimgui lua_static pugixml freetype testbed game)
+target_link_libraries(${PROJECT_NAME} box2d glfw glad glm dearimgui lua_static pugixml freetype testbed)
 if (NOT NO_EDITOR)
    target_link_libraries(${PROJECT_NAME} editor)
--- a/src/run_modes/editor/panels/world_tree.cpp
+++ b/src/run_modes/editor/panels/world_tree.cpp
@ -7,7 +7,7 @@
 ******************************************************************************/
 #include "world_tree.h"
-#include <game/world/world.h>
+#include <world/world.h>
 #include <dearimgui/imgui.h>
 #include <editor/editor.h>
--- a/src/run_modes/editor/panels/world_view.cpp
+++ b/src/run_modes/editor/panels/world_view.cpp
@ -8,7 +8,7 @@
 #include "world_view.h"
 #include <utils/logger.h>
-#include <game/world/world.h>
+#include <world/world.h>
 #include <dearimgui/imgui.h>
 #include <editor/editor.h>
 #include "../panel_manager.h"