diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 634a85a..7eba93e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,7 +36,6 @@ include_directories(${lib_base_path}) if(WIN32) add_executable(${RenderName} WIN32 ${SHADERS_GLSL} ${SHADERS_HLSL} - ${3rdParty_imgui_path} ${MAIN_FILE} "render/glTFModel.h" "render/glTFModel.cpp" diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index 5e43973..ccb6642 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -1,4 +1,4 @@ -file(GLOB BASE_SRC "*.cpp" "*.hpp" "*.h" "../3rdparty/imgui/*.cpp") +file(GLOB BASE_SRC "*.cpp" "*.hpp" "*.h" "${3rdParty_imgui_path}/*.cpp" ) file(GLOB BASE_HEADERS "*.hpp" "*.h") set(KTX_DIR ${3rdPARTY_PATH}/ktx) @@ -17,8 +17,10 @@ include_directories(${3rdParty_gli_path}) include_directories(${3rdParty_vulkan_path}) include_directories(${3rdParty_imgui_path}) +message("======================debug=====================") +message(${BASE_SRC}) -add_library(base STATIC ${BASE_SRC} ${KTX_SOURCES} ${BASE_HEADERS} ${3rdParty_imgui_path}) +add_library(base STATIC ${BASE_SRC} ${KTX_SOURCES}) if(WIN32) target_link_libraries(base ${Vulkan_LIBRARY} ${WINLIBS}) else(WIN32) diff --git a/src/base/ui.hpp b/src/base/ui.hpp index 9d3f2f4..80cd76f 100644 --- a/src/base/ui.hpp +++ b/src/base/ui.hpp @@ -1,10 +1,4 @@  -#include -#include -#include - -#include "vulkan/vulkan.h" -#include "imgui.h" #include "VulkanDevice.hpp" #include "VulkanUtils.hpp" #include "VulkanTexture.hpp" @@ -13,11 +7,22 @@ #include #endif +#include + +#include +#include +#include + #define GLM_FORCE_RADIANS #define GLM_FORCE_DEPTH_ZERO_TO_ONE #include #include +#include +#include +#include + + struct UI { private: VkDevice device;