修复imgui链接错误
parent
d7f55c1264
commit
bca2a1367f
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,10 +1,4 @@
|
|||
|
||||
#include <vector>
|
||||
#include <array>
|
||||
#include <map>
|
||||
|
||||
#include "vulkan/vulkan.h"
|
||||
#include "imgui.h"
|
||||
#include "VulkanDevice.hpp"
|
||||
#include "VulkanUtils.hpp"
|
||||
#include "VulkanTexture.hpp"
|
||||
|
@ -13,11 +7,22 @@
|
|||
#include <android/asset_manager.h>
|
||||
#endif
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
|
||||
#include <imgui.h>
|
||||
#include <backends/imgui_impl_vulkan.h>
|
||||
#include <backends/imgui_impl_glfw.h>
|
||||
|
||||
#define GLM_FORCE_RADIANS
|
||||
#define GLM_FORCE_DEPTH_ZERO_TO_ONE
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
#include <vector>
|
||||
#include <array>
|
||||
#include <map>
|
||||
|
||||
|
||||
struct UI {
|
||||
private:
|
||||
VkDevice device;
|
||||
|
|
Loading…
Reference in New Issue