From 59f984361db5b1be034e2961677d0377e1c16a6c Mon Sep 17 00:00:00 2001 From: gradient Date: Sun, 10 Sep 2017 18:51:39 -0500 Subject: [PATCH] disable nfd dialogs because nfd's build is fucking trash --- .gitmodules | 3 --- CMakeLists.txt | 4 ++-- deps/nfd | 1 - src/gui.cpp | 7 +++---- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 160000 deps/nfd diff --git a/.gitmodules b/.gitmodules index 2281439..5c36d43 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "deps/cpptoml"] path = deps/cpptoml url = https://github.com/skystrife/cpptoml -[submodule "deps/nfd"] - path = deps/nfd - url = https://github.com/mlabbe/nativefiledialog [submodule "deps/filesystem"] path = deps/filesystem url = https://github.com/wjakob/filesystem diff --git a/CMakeLists.txt b/CMakeLists.txt index 09e4516..72e21af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(deps/gl3w/include) add_library(gl3w deps/gl3w/src/gl3w.c) target_link_libraries(gl3w dl) -include_directories(deps/nfd/src/include) +#include_directories(deps/nfd/src/include) include_directories(deps/cpptoml/include) include_directories(deps/filesystem) @@ -33,4 +33,4 @@ target_link_libraries(zinnia ${OPENGL_LIBRARIES}) target_link_libraries(zinnia ${GLFW_LIBRARIES}) target_link_libraries(zinnia gl3w) target_link_libraries(zinnia ${GTK3_LIBRARIES}) -target_link_libraries(zinnia ${CMAKE_SOURCE_DIR}/deps/nfd/build/lib/Release/x64/libnfd.a) +#target_link_libraries(zinnia ${CMAKE_SOURCE_DIR}/deps/nfd/build/lib/Release/x64/libnfd.a) diff --git a/deps/nfd b/deps/nfd deleted file mode 160000 index 5cfe500..0000000 --- a/deps/nfd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5cfe5002eb0fac1e49777a17dec70134147931e2 diff --git a/src/gui.cpp b/src/gui.cpp index 7dabbc8..664da35 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include "gui.h" #include "project.h" @@ -51,7 +50,7 @@ void Gui::render_project_overlay() { void Gui::render_mmb_file() { if (ImGui::MenuItem("Load project", "CTRL+O")) { - nfdchar_t *out_path = nullptr; + /*nfdchar_t *out_path = nullptr; nfdresult_t result = NFD_OpenDialog(NULL, NULL, &out_path); if (result == NFD_OKAY) { // Load project @@ -61,7 +60,7 @@ void Gui::render_mmb_file() { free(out_path); } else if (result == NFD_ERROR) { std::cout << "Error in filepicker: " << NFD_GetError() << '\n'; - } + }*/ } ImGui::Separator(); @@ -86,7 +85,7 @@ void Gui::render_mmb_view() { void Gui::render_mmb_debug() { ImGui::MenuItem("Profiler"); - + if (ImGui::MenuItem("Reload shaders", "CTRL+R")) { if (state->current_project != nullptr) { if (state->current_project->scene_loaded) {