diff --git a/story-editor/CMakeLists.txt b/story-editor/CMakeLists.txt index a05c2b2..362736c 100644 --- a/story-editor/CMakeLists.txt +++ b/story-editor/CMakeLists.txt @@ -168,9 +168,16 @@ if(WIN32) ) endif() +if(WIN32) add_executable(${STORY_EDITOR_PROJECT} + WIN32 ${SRCS} ) +else() + add_executable(${STORY_EDITOR_PROJECT} + ${SRCS} + ) +endif() target_include_directories(${STORY_EDITOR_PROJECT} PUBLIC ${imgui_SOURCE_DIR} @@ -205,7 +212,7 @@ target_link_libraries(${STORY_EDITOR_PROJECT} ) elseif(WIN32) -target_compile_features("-Wl,-subsystem,windows") +#target_compile_features("-Wl,-subsystem,windows") target_link_libraries(${STORY_EDITOR_PROJECT} OpenGL::GL diff --git a/story-editor/src/main_window.cpp b/story-editor/src/main_window.cpp index 4c7ab36..334e2a5 100644 --- a/story-editor/src/main_window.cpp +++ b/story-editor/src/main_window.cpp @@ -631,7 +631,7 @@ void MainWindow::NewProjectPopup() if (valid) { auto p = std::filesystem::path(projdir) / std::filesystem::path("project.json"); - m_project.Initialize(p.generic_string()); + m_story.Initialize(p.generic_string()); if (display_item_current_idx == 0) { diff --git a/story-editor/src/resources_window.cpp b/story-editor/src/resources_window.cpp index 70931a0..56adb35 100644 --- a/story-editor/src/resources_window.cpp +++ b/story-editor/src/resources_window.cpp @@ -44,7 +44,7 @@ void ResourcesWindow::ChooseFile() std::filesystem::path p(filePathName); - std::filesystem::path p2 = m_project.BuildFullAssetsPath( p.filename().generic_string()); + std::filesystem::path p2 = m_story.BuildFullAssetsPath( p.filename().generic_string()); std::filesystem::copy(p, p2, std::filesystem::copy_options::overwrite_existing); auto res = std::make_shared();