@@ -30,9 +30,12 @@ if (BUILD_VARIANT_VENDOR OR WIN32)
30
30
endif ()
31
31
set (GLFW_INCLUDE_DIRS "${UIMGUI_SRC_PREFIX} /Framework/ThirdParty/glfw/include/" )
32
32
set (GLFW_LIBRARIES_T "glfw" )
33
+
33
34
if (WIN32 )
34
35
set (OPENGL_LIBRARIES_T "opengl32" )
35
36
set (VULKAN_LIBRARIES_T "vulkan-1" )
37
+
38
+ add_subdirectory ("${UIMGUI_SRC_PREFIX} /Framework/ThirdParty/vulkan-headers" )
36
39
elseif (APPLE )
37
40
find_package (OpenGL REQUIRED)
38
41
set (OPENGL_LIBRARIES_T ${OPENGL_LIBRARIES} )
@@ -43,9 +46,10 @@ if (BUILD_VARIANT_VENDOR OR WIN32)
43
46
set (OPENGL_LIBRARIES_T "OpenGL" )
44
47
set (X11_LIBRARIES "X11" )
45
48
set (VULKAN_LIBRARIES_T "vulkan" )
46
- else ()
49
+
50
+ add_subdirectory ("${UIMGUI_SRC_PREFIX} /Framework/ThirdParty/vulkan-headers" )
47
51
endif ()
48
- add_subdirectory ( " ${UIMGUI_SRC_PREFIX} /Framework/ThirdParty/vulkan-headers" )
52
+
49
53
if (NOT BUILD_VARIANT_STATIC)
50
54
set (BUILD_SHARED_LIBS ON )
51
55
endif ()
@@ -67,12 +71,15 @@ if (BUILD_VARIANT_VENDOR OR WIN32)
67
71
else ()
68
72
find_package (PkgConfig REQUIRED)
69
73
find_package (OpenGL REQUIRED)
74
+
70
75
if (NOT EMSCRIPTEN)
71
76
find_package (Freetype REQUIRED)
72
77
endif ()
78
+
73
79
if (NOT WIN32 )
74
80
find_package (X11 REQUIRED)
75
81
endif ()
82
+
76
83
# Re-enable when yaml-cpp 0.8 is released
77
84
if (BUILD_VARIANT_STATIC)
78
85
set (YamlCpp_STATIC ON )
@@ -83,12 +90,14 @@ else()
83
90
set (YAML_CPP_LIBRARIES_T "${YamlCpp_LIBRARY} " )
84
91
85
92
set (OPENGL_LIBRARIES_T "${OPENGL_gl_LIBRARY} " "${OPENGL_LIBRARIES} " )
93
+
86
94
pkg_check_modules(GLFW REQUIRED glfw3)
87
95
if (BUILD_VARIANT_STATIC)
88
96
set (GLFW_LIBRARIES_T ${GLFW_STATIC_LIBRARIES} )
89
97
else ()
90
98
set (GLFW_LIBRARIES_T ${GLFW_LIBRARIES} )
91
99
endif ()
100
+
92
101
pkg_check_modules(Vulkan REQUIRED vulkan)
93
102
set (VULKAN_LIBRARIES_T ${Vulkan_LINK_LIBRARIES} )
94
103
endif ()
0 commit comments