Skip to content

Commit 4f8e56b

Browse files
committed
Actually fix problems with nblext
1 parent 6bc211b commit 4f8e56b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cmake/common.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,11 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
238238
target_link_libraries(${LIB_NAME} PUBLIC Nabla)
239239
target_compile_options(${LIB_NAME} PUBLIC ${LIB_OPTIONS})
240240
target_compile_definitions(${LIB_NAME} PUBLIC ${DEF_OPTIONS})
241-
target_compile_definitions(${LIB_NAME} PRIVATE __NBL_BUILDING_NABLA__)
242-
set_target_properties(${LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
241+
if(NBL_DYNAMIC_MSVC_RUNTIME)
242+
set_target_properties(${LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
243+
else()
244+
set_target_properties(${LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
245+
endif()
243246

244247
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
245248
add_compile_options(

include/nbl/ext/ImGui/ImGui.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace nbl::ext::imgui
66
{
7-
class NBL_API2 UI final : public core::IReferenceCounted{
7+
class UI final : public core::IReferenceCounted{
88
public:
99

1010
UI(

0 commit comments

Comments
 (0)