Skip to content

Commit 93d07b4

Browse files
rvkennedyrvkennedy
committed
Allow for dynamic runtime builds on Windows.
1 parent df1a9fb commit 93d07b4

File tree

11 files changed

+55
-125
lines changed

11 files changed

+55
-125
lines changed

‎Applications/GuiSample/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ file(GLOB shaders "Shaders/*.sfx" "Shaders/*.sl")
66

77
source_group("Shaders" src FILES ${shaders} )
88

9-
add_static_executable(GuiSample_MT WIN32 SOURCES ${SOURCES} ${HEADERS} ${shaders} DEFINITIONS ${SAMPLE_API} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX} INCLUDES ${SIMUL_PLATFORM_DIR}/External/imgui)
10-
target_link_libraries(GuiSample_MT ImGui_MT SimulCrossPlatform_MT SimulMath_MT Core_MT directxtex_MT fmt::fmt-header-only)
9+
add_static_executable(GuiSample${STATIC_LINK_SUFFIX} WIN32 SOURCES ${SOURCES} ${HEADERS} ${shaders} DEFINITIONS ${SAMPLE_API} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX} INCLUDES ${SIMUL_PLATFORM_DIR}/External/imgui)
10+
target_link_libraries(GuiSample${STATIC_LINK_SUFFIX} ImGui${STATIC_LINK_SUFFIX} SimulCrossPlatform${STATIC_LINK_SUFFIX} SimulMath${STATIC_LINK_SUFFIX} Core${STATIC_LINK_SUFFIX} directxtex${STATIC_LINK_SUFFIX} fmt::fmt-header-only)
1111
if(PLATFORM_SUPPORT_D3D11)
12-
target_link_libraries(GuiSample_MT SimulDirectX11_MT )
12+
target_link_libraries(GuiSample${STATIC_LINK_SUFFIX} SimulDirectX11${STATIC_LINK_SUFFIX} )
1313
endif()
1414
if(PLATFORM_SUPPORT_D3D12)
15-
target_link_libraries(GuiSample_MT SimulDirectX12_MT )
15+
target_link_libraries(GuiSample${STATIC_LINK_SUFFIX} SimulDirectX12${STATIC_LINK_SUFFIX} )
1616
endif()
1717
if(PLATFORM_SUPPORT_VULKAN)
18-
target_link_libraries(GuiSample_MT SimulVulkan_MT ${Vulkan_LIBRARY} )
18+
target_link_libraries(GuiSample${STATIC_LINK_SUFFIX} SimulVulkan${STATIC_LINK_SUFFIX} ${Vulkan_LIBRARY} )
1919
endif()

‎Applications/Sample/CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,41 @@ set(SAMPLE_API SAMPLE_USE_D3D12)
1212

1313
source_group("Shaders" src FILES ${shaders} )
1414

15-
add_static_executable(Sample_MT WIN32 SOURCES ${SOURCES} ${HEADERS} ${shaders} DEFINITIONS ${SAMPLE_API} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
16-
target_include_directories(Sample_MT PRIVATE "${CMAKE_SOURCE_DIR}/External/DirectX/DirectXTex/DirectXTex" )
17-
target_compile_definitions(Sample_MT PRIVATE DO_PROFILING=0 )
18-
set_target_properties(Sample_MT PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
15+
add_static_executable(Sample${STATIC_LINK_SUFFIX} WIN32 SOURCES ${SOURCES} ${HEADERS} ${shaders} DEFINITIONS ${SAMPLE_API} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
16+
target_include_directories(Sample${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/External/DirectX/DirectXTex/DirectXTex" )
17+
target_compile_definitions(Sample${STATIC_LINK_SUFFIX} PRIVATE DO_PROFILING=0 )
18+
set_target_properties(Sample${STATIC_LINK_SUFFIX} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
1919
VS_DEBUGGER_ENVIRONMENT "PATH=${PLATFORM_ANGLE_LIB_DIR};${fx_path};$(PATH)\nSIMUL=${SIMUL_DIR}\nSIMUL_BUILD=${CMAKE_BINARY_DIR}\n${VS_DEBUGGER_ENVIRONMENT}")
20-
target_link_libraries(Sample_MT PRIVATE SimulCrossPlatform_MT SimulMath_MT Core_MT directxtex_MT fmt::fmt-header-only)
20+
target_link_libraries(Sample${STATIC_LINK_SUFFIX} PRIVATE SimulCrossPlatform${STATIC_LINK_SUFFIX} SimulMath${STATIC_LINK_SUFFIX} Core${STATIC_LINK_SUFFIX} directxtex${STATIC_LINK_SUFFIX} fmt::fmt-header-only)
2121
if(PLATFORM_USE_ASSIMP)
22-
DelayLoadLinkAssimp(Sample_MT)
22+
DelayLoadLinkAssimp(Sample${STATIC_LINK_SUFFIX})
2323
endif()
2424

25-
add_multiplatform_sfx_shader_project (Sample_MT SOURCES ${shaders} INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Shaders" OPTIONS OUTPUT "${CMAKE_BINARY_DIR}/shaderbin/$PLATFORM_NAME")
25+
add_multiplatform_sfx_shader_project (Sample${STATIC_LINK_SUFFIX} SOURCES ${shaders} INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Shaders" OPTIONS OUTPUT "${CMAKE_BINARY_DIR}/shaderbin/$PLATFORM_NAME")
2626

2727
if(PLATFORM_SUPPORT_ANGLE)
2828
if(${SAMPLE_API} MATCHES "SAMPLE_USE_GLES")
29-
target_include_directories(Sample_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/GLES")
30-
target_link_libraries(Sample_MT PRIVATE SimulGLES_MT libGLESv2.dll.lib libEGL.dll.lib)
29+
target_include_directories(Sample${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/GLES")
30+
target_link_libraries(Sample${STATIC_LINK_SUFFIX} PRIVATE SimulGLES${STATIC_LINK_SUFFIX} libGLESv2.dll.lib libEGL.dll.lib)
3131
endif()
3232
endif()
3333
if(PLATFORM_SUPPORT_D3D11)
3434
if(${SAMPLE_API} MATCHES "SAMPLE_USE_D3D11")
35-
target_include_directories(Sample_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX11")
36-
target_link_libraries(Sample_MT PRIVATE SimulDirectX11_MT )
35+
target_include_directories(Sample${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX11")
36+
target_link_libraries(Sample${STATIC_LINK_SUFFIX} PRIVATE SimulDirectX11${STATIC_LINK_SUFFIX} )
3737
endif()
3838
endif()
3939

4040
if(PLATFORM_SUPPORT_D3D12)
4141
if(${SAMPLE_API} MATCHES "SAMPLE_USE_D3D12")
42-
target_include_directories(Sample_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX12")
43-
target_link_libraries(Sample_MT PRIVATE SimulDirectX12_MT)
42+
target_include_directories(Sample${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX12")
43+
target_link_libraries(Sample${STATIC_LINK_SUFFIX} PRIVATE SimulDirectX12${STATIC_LINK_SUFFIX})
4444
endif()
4545
endif()
4646

4747
if(PLATFORM_SUPPORT_VULKAN)
4848
if(${SAMPLE_API} MATCHES "SAMPLE_USE_VULKAN")
49-
target_include_directories(Sample_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/External/VulkanMemoryAllocator/include")
50-
target_link_libraries(Sample_MT PRIVATE SimulVulkan_MT)
49+
target_include_directories(Sample${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/External/VulkanMemoryAllocator/include")
50+
target_link_libraries(Sample${STATIC_LINK_SUFFIX} PRIVATE SimulVulkan${STATIC_LINK_SUFFIX})
5151
endif()
5252
endif()

‎Applications/Test/CMakeLists.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@ source_group("Shaders" src FILES ${shaders} )
1010

1111
set(SAMPLE_USE_APIS SAMPLE_USE_D3D11=$<BOOL:${PLATFORM_SUPPORT_D3D11}> SAMPLE_USE_D3D12=$<BOOL:${PLATFORM_SUPPORT_D3D12}> SAMPLE_USE_OPENGL=$<BOOL:${PLATFORM_SUPPORT_OPENGL}> SAMPLE_USE_VULKAN=$<BOOL:${PLATFORM_SUPPORT_VULKAN}> )
1212

13-
add_static_executable( Test_MT WIN32 SOURCES ${SOURCES} ${HEADERS} ${shaders} DEFINITIONS ${SAMPLE_USE_APIS} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
14-
target_include_directories( Test_MT PRIVATE "${CMAKE_SOURCE_DIR}/External/DirectX/DirectXTex/DirectXTex" )
15-
target_compile_definitions( Test_MT PRIVATE DO_PROFILING=0 )
16-
set_target_properties( Test_MT PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
13+
add_static_executable( Test${STATIC_LINK_SUFFIX} WIN32 SOURCES ${SOURCES} ${HEADERS} ${shaders} DEFINITIONS ${SAMPLE_USE_APIS} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
14+
target_include_directories( Test${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/External/DirectX/DirectXTex/DirectXTex" )
15+
target_compile_definitions( Test${STATIC_LINK_SUFFIX} PRIVATE DO_PROFILING=0 )
16+
set_target_properties( Test${STATIC_LINK_SUFFIX} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
1717
VS_DEBUGGER_ENVIRONMENT "PATH=${fx_path};$(PATH)\nSIMUL=${SIMUL_DIR}\nSIMUL_BUILD=${CMAKE_BINARY_DIR}\n${VS_DEBUGGER_ENVIRONMENT}")
18-
target_link_libraries( Test_MT PRIVATE SimulCrossPlatform_MT SimulMath_MT Core_MT directxtex_MT fmt::fmt-header-only )
18+
target_link_libraries( Test${STATIC_LINK_SUFFIX} PRIVATE SimulCrossPlatform${STATIC_LINK_SUFFIX} SimulMath${STATIC_LINK_SUFFIX} Core${STATIC_LINK_SUFFIX} directxtex${STATIC_LINK_SUFFIX} fmt::fmt-header-only )
1919

2020
if(PLATFORM_USE_ASSIMP)
21-
DelayLoadLinkAssimp(Test_MT)
21+
DelayLoadLinkAssimp(Test${STATIC_LINK_SUFFIX})
2222
endif()
2323

2424
if(PLATFORM_SUPPORT_D3D11)
25-
target_include_directories(Test_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX11")
26-
target_link_libraries(Test_MT PRIVATE SimulDirectX11_MT )
25+
target_include_directories(Test${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX11")
26+
target_link_libraries(Test${STATIC_LINK_SUFFIX} PRIVATE SimulDirectX11${STATIC_LINK_SUFFIX} )
2727
endif()
2828

2929
if(PLATFORM_SUPPORT_D3D12)
30-
target_include_directories(Test_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX12")
31-
target_link_libraries(Test_MT PRIVATE SimulDirectX12_MT)
30+
target_include_directories(Test${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/DirectX12")
31+
target_link_libraries(Test${STATIC_LINK_SUFFIX} PRIVATE SimulDirectX12${STATIC_LINK_SUFFIX})
3232
endif()
3333

3434
if(PLATFORM_SUPPORT_VULKAN)
35-
target_include_directories(Test_MT PRIVATE "${CMAKE_SOURCE_DIR}/Platform/External/VulkanMemoryAllocator/include")
36-
target_include_directories(Test_MT PUBLIC "${Vulkan_INCLUDE_DIR}")
37-
target_link_libraries(Test_MT PRIVATE SimulVulkan_MT glfw ${Vulkan_LIBRARY})
35+
target_include_directories(Test${STATIC_LINK_SUFFIX} PRIVATE "${CMAKE_SOURCE_DIR}/Platform/External/VulkanMemoryAllocator/include")
36+
target_include_directories(Test${STATIC_LINK_SUFFIX} PUBLIC "${Vulkan_INCLUDE_DIR}")
37+
target_link_libraries(Test${STATIC_LINK_SUFFIX} PRIVATE SimulVulkan${STATIC_LINK_SUFFIX} glfw ${Vulkan_LIBRARY})
3838
endif()
3939

4040
if(PLATFORM_SUPPORT_OPENGL)
41-
target_link_libraries(Test_MT PRIVATE SimulOpenGL_MT glfw)
41+
target_link_libraries(Test${STATIC_LINK_SUFFIX} PRIVATE SimulOpenGL${STATIC_LINK_SUFFIX} glfw)
4242
endif()

‎CMake/Include.cmake‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,9 @@ function(add_static_library libname)
352352
set(LINK_SUFFIX "_MD" )
353353
endif()
354354
endif()
355-
355+
356356
set(target "${libname}${LINK_SUFFIX}")
357+
set(target "${target}" PARENT_SCOPE)
357358
add_library(${target} STATIC ${IMP_LIB} )
358359
add_library(Platform::${target} ALIAS ${target})
359360
if(SIMUL_SOURCE_BUILD)
@@ -415,16 +416,22 @@ function(add_static_library libname)
415416
else()
416417
ImportedLibraryDefaults(${target})
417418
endif()
419+
message("add_static_library target is " ${target})
420+
return(PROPAGATE target)
418421
endfunction()
419422

420423
function(add_dynamic_library libname)
421424
if( SIMUL_DYNAMIC_LIBS )
422425
add_dll( ${libname} ${ARGN} )
426+
set(target "${target}" PARENT_SCOPE)
427+
return(PROPAGATE target)
423428
endif()
429+
return("")
424430
endfunction()
425431

426432
function(add_dll libname)
427433
set(target "${libname}${DYNAMIC_LINK_SUFFIX}")
434+
set(target "${target}" PARENT_SCOPE)
428435
cmake_parse_arguments(dll "" "RUNTIME;FOLDER" "SOURCES;DEFINITIONS;LINK;LINK_DIRS;PROPERTIES;INCLUDES;PUBLICINCLUDES" ${ARGN} )
429436
if("${dll_FOLDER}" STREQUAL "")
430437
set(dll_FOLDER Dynamic)
@@ -494,6 +501,7 @@ function(add_dll libname)
494501
else()
495502
ImportedLibraryDefaults(${target})
496503
endif()
504+
return(PROPAGATE target)
497505
endfunction()
498506

499507
function(ExecutableDefaults target)
@@ -535,6 +543,7 @@ function(add_static_executable target)
535543
set_target_runtime(${target} ${PLATFORM_WINDOWS_RUNTIME})
536544
LibraryDefaults(${target})
537545
ExecutableDefaults(${target})
546+
return(PROPAGATE target)
538547
endfunction()
539548

540549
function(add_dynamic_executable target)
@@ -571,4 +580,5 @@ function(add_dynamic_executable target)
571580
if(NOT "${exe_LINK}" STREQUAL "")
572581
target_link_libraries( ${target} ${exe_LINK} )
573582
endif()
583+
return(PROPAGATE target)
574584
endfunction()

‎DirectX11/CMakeLists.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,4 @@ endif()
3030
if(SIMUL_SOURCE_BUILD)
3131
set( JSON_FILE "${SIMUL_PLATFORM_DIR}/DirectX11/Sfx/DirectX11.json" )
3232

33-
if(PLATFORM_BUILD_MD_LIBS)
34-
add_dynamic_library(SimulDirectX11 SOURCES ${SOURCES} ${HEADERS} ${CMAKE} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
35-
target_compile_definitions(SimulDirectX11_MD PRIVATE SIMUL_DIRECTX11_DLL=1 SIMUL_WIN8_SDK=1 PLATFORM_D3D11_SFX=1 PLATFORM_TYPED_UAV_FORMATS=1)
36-
set_target_properties(SimulDirectX11_MD PROPERTIES LINK_FLAGS "/DELAYLOAD:d3dcompiler_47.dll")
37-
target_include_directories(SimulDirectX11_MD PUBLIC "${SIMUL_PLATFORM_DIR}/DirectX11")
38-
target_include_directories(SimulDirectX11_MD PRIVATE "${SIMUL_PLATFORM_DIR}/External/DirectX/DirectXTex/DirectXTex" )
39-
LibraryDefaults(SimulDirectX11_MD)
40-
41-
target_link_libraries(SimulDirectX11_MD SimulCrossPlatform_MD SimulMath_MD Core_MD directxtex_MD)
42-
43-
endif()
4433
endif()

‎DirectX11/CreateEffectDX1x.cpp‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -207,35 +207,6 @@ struct d3dMacro
207207
std::string define;
208208
};
209209

210-
static double GetNewestIncludeFileDate(std::string text_filename_utf8,const std::vector<std::string> &shaderPathsUtf8
211-
,void *textData,size_t textSize,D3D_SHADER_MACRO *macros,uint64_t binary_date,bool &missing)
212-
{
213-
ID3DBlob *binaryBlob=NULL;
214-
ID3DBlob *errorMsgs=NULL;
215-
int pos=(int)text_filename_utf8.find_last_of("/");
216-
int bpos=(int)text_filename_utf8.find_last_of("\\");
217-
if(pos<0||bpos>pos)
218-
pos=bpos;
219-
std::string path_utf8=text_filename_utf8.substr(0,pos);
220-
DetectChangesIncludeHandler detectChangesIncludeHandler(path_utf8.c_str(),shaderPathsUtf8,binary_date);
221-
HRESULT hr=D3DPreprocess( textData
222-
,textSize
223-
,text_filename_utf8.c_str() //in LPCSTR pSourceName,
224-
,macros //in const D3D_SHADER_MACRO *pDefines,
225-
,&detectChangesIncludeHandler //in ID3DInclude pInclude,
226-
,&binaryBlob //ID3DBlob **ppCodeText,
227-
,&errorMsgs //ID3DBlob **ppErrorMsgs
228-
);
229-
// Don't V_CHECK here as we'll often expect a S_FAIL result for early-out.
230-
uint64_t newestFileTime=detectChangesIncludeHandler.GetNewestIncludeTimestamp();
231-
if(binaryBlob)
232-
binaryBlob->Release();
233-
if(errorMsgs)
234-
errorMsgs->Release();
235-
missing=(newestFileTime==0&&hr!=S_OK);
236-
return (double)newestFileTime;
237-
}
238-
239210
#define D3D10_SHADER_ENABLE_STRICTNESS (1 << 11)
240211
#ifndef SAFE_RELEASE
241212
#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p)=NULL; } }

‎DirectX11/Export.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@
1818
#pragma warning Unknown dynamic link import/export semantics.
1919
#endif
2020

21-
#if defined(_MSC_VER) && !defined(SIMUL_DIRECTX11_DLL) && !defined(SIMUL_NO_PRAGMA_LINK)
22-
#ifdef _DEBUG
23-
#ifdef _DLL
24-
#pragma comment(lib,"SimulDirectX11_MDd")
25-
#else
26-
#pragma comment(lib,"SimulDirectX11_MTd")
27-
#endif
28-
#else
29-
#ifdef _DLL
30-
#pragma comment(lib,"SimulDirectX11_MD")
31-
#else
32-
#pragma comment(lib,"SimulDirectX11_MT")
33-
#endif
34-
#endif
35-
#endif
3621

3722
#if defined(SIMUL_DYNAMIC_LINK) && !defined(DOXYGEN)
3823
// In this lib:

‎External/DirectX/DirectXTex/DirectXTex/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ if(PLATFORM_WINDOWS )
4848
add_static_library (directxtex SOURCES ${DIRECTX_TEX_SRC} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
4949
endif()
5050

51-
if(PLATFORM_BUILD_MD_LIBS)
52-
add_static_library(directxtex SOURCES ${DIRECTX_TEX_SRC} RUNTIME MD FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX})
53-
endif()
5451

5552
#target_compile_options( directxtex PRIVATE /fp:fast )
5653

‎ImGui/CMakeLists.txt‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,21 @@ file(GLOB SHADER_INCLUDES "Shaders/*.sl")
3030
# Setup and build the static library.
3131
add_static_library( ImGui SOURCES ${SOURCES} ${HEADERS} ${SHADERS} ${SHADER_INCLUDES} DEFINITIONS PLATFORM_STD_FILESYSTEM=${PLATFORM_STD_FILESYSTEM} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX} PUBLICINCLUDES ${SIMUL_PLATFORM_DIR}/External/imgui)
3232

33+
message("target is " ${target})
3334
if(SIMUL_SOURCE_BUILD)
34-
target_include_directories(ImGui_MT PUBLIC "${SIMUL_PLATFORM_DIR}/External/glfw/include")
35-
target_include_directories(ImGui_MT PUBLIC "${SIMUL_PLATFORM_DIR}/External")
35+
target_include_directories(${target} PUBLIC "${SIMUL_PLATFORM_DIR}/External/glfw/include")
36+
target_include_directories(${target} PUBLIC "${SIMUL_PLATFORM_DIR}/External")
3637
else()
37-
target_include_directories(ImGui_MT INTERFACE "${SIMUL_PLATFORM_DIR}/External/glfw/include")
38-
target_include_directories(ImGui_MT INTERFACE "${SIMUL_PLATFORM_DIR}/External")
38+
target_include_directories(${target} INTERFACE "${SIMUL_PLATFORM_DIR}/External/glfw/include")
39+
target_include_directories(${target} INTERFACE "${SIMUL_PLATFORM_DIR}/External")
3940
endif()
4041

4142
if (SIMUL_DLL_SDK_LIBRARY)
42-
AddDLLCompileDefinitions( ImGui_MT )
43-
target_compile_definitions(ImGui_MT PRIVATE "IMGUI_API=__declspec(dllexport)")
43+
AddDLLCompileDefinitions( ${target} )
44+
target_compile_definitions(${target} PRIVATE "IMGUI_API=__declspec(dllexport)")
4445
endif()
4546

46-
add_multiplatform_sfx_shader_project( ImGui_MT INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Shaders"
47+
add_multiplatform_sfx_shader_project( ${target} INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Shaders"
4748
"${SIMUL_PLATFORM_DIR}/.."
4849
SOURCES ${SHADERS} ${SHADER_INCLUDES} OPTIONS DEFINES VULKAN_SDK=${VULKAN_SDK_DIR}
4950
OUTPUT "${CMAKE_BINARY_DIR}/shaderbin/$PLATFORM_NAME" )
50-
if(PLATFORM_BUILD_MD_LIBS)
51-
# Setup and build the dynamic library.
52-
add_dynamic_library( ImGui SOURCES ${SOURCES} ${HEADERS} ${SHADERS} DEFINITIONS PLATFORM_IMGUI_DLL=1 PLATFORM_STD_FILESYSTEM=${PLATFORM_STD_FILESYSTEM} "IMGUI_API=__declspec(dllexport)" FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX} PUBLICINCLUDES ${SIMUL_PLATFORM_DIR}/External/imgui LINK SimulCrossPlatform_MD)
53-
target_link_directories( ImGui_MD PUBLIC ${SIMUL_PLATFORM_DIR}/External/glfw/build_md/lib/${CMAKE_BUILD_TYPE})
54-
target_link_libraries (ImGui_MD glfw)
55-
target_include_directories(ImGui_MD PUBLIC "${SIMUL_PLATFORM_DIR}/External/glfw/include")
56-
endif()

‎ImGui/Export.h‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,7 @@
1616
#pragma warning Unknown dynamic link import/export semantics.
1717
#endif
1818

19-
#if defined(_MSC_VER) && !defined(PLATFORM_IMGUI_DLL) && !defined(SIMUL_NO_PRAGMA_LINK)
20-
#ifdef _DEBUG
21-
#ifdef _DLL
22-
#pragma comment(lib,"ImGui_MDd")
23-
#else
24-
#pragma comment(lib,"ImGui_MTd")
25-
#endif
26-
#else
27-
#ifdef _DLL
28-
#pragma comment(lib,"ImGui_MD")
29-
#else
30-
#pragma comment(lib,"ImGui_MT")
31-
#endif
32-
#endif
33-
#endif
19+
3420

3521
#if defined(SIMUL_DYNAMIC_LINK) && !defined(DOXYGEN)
3622
// In this lib:

0 commit comments

Comments
 (0)