Skip to content

Commit 27e88f8

Browse files
committed
add EGL nbl_create_ext_libra macro + Matt be careful when using inline specifier
1 parent f770ef0 commit 27e88f8

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

cmake/common.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
183183
add_dependencies(${LIB_NAME} Nabla)
184184

185185
get_target_property(_NBL_NABLA_TARGET_BINARY_DIR_ Nabla BINARY_DIR)
186+
get_target_property(NBL_EGL_INCLUDE_DIRECORIES egl INCLUDE_DIRECTORIES)
186187

187188
target_include_directories(${LIB_NAME}
188189
PUBLIC ${_NBL_NABLA_TARGET_BINARY_DIR_}/build/import
@@ -193,6 +194,7 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
193194
PUBLIC ${CMAKE_SOURCE_DIR}/src
194195
PUBLIC ${CMAKE_SOURCE_DIR}/source/Nabla
195196
PRIVATE ${LIB_INCLUDES}
197+
PRIVATE ${NBL_EGL_INCLUDE_DIRECORIES}
196198
)
197199
add_dependencies(${LIB_NAME} Nabla)
198200
target_link_libraries(${LIB_NAME} PUBLIC Nabla)

include/nbl/video/COpenGLSync.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class COpenGLSync final : public core::IReferenceCounted
5757
// Already signalled constructor (for IGPUFence)
5858
struct signalled_t {};
5959
constexpr static inline signalled_t signalled = {};
60-
inline COpenGLSync(core::smart_refctd_ptr<IOpenGL_LogicalDevice>&& _dev, IOpenGL_FunctionTable* _gl, signalled_t signalled);
60+
COpenGLSync(core::smart_refctd_ptr<IOpenGL_LogicalDevice>&& _dev, IOpenGL_FunctionTable* _gl, signalled_t signalled);
6161

6262
private:
6363
core::smart_refctd_ptr<IOpenGL_LogicalDevice> device;

0 commit comments

Comments
 (0)