@@ -143,14 +143,15 @@ set(PLAYGROUND_SHADERS
143143# simple_cube instancing billboard_instances
144144)
145145
146- file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} /generated_src)
146+ file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR} /generated_src)" )
147+
147148foreach (SHADER ${PLAYGROUND_SHADERS} )
148149 add_custom_command (
149- OUTPUT ${CMAKE_CURRENT_BINARY_DIR} /generated_src/${SHADER} _glsl.h
150- COMMAND ${CMAKE_CURRENT_SOURCE_DIR} /third/sokol-tools-bin/bin/win32 /sokol-shdc.exe --input ${CMAKE_CURRENT_SOURCE_DIR} /src/${SHADER} .glsl --output ${CMAKE_CURRENT_BINARY_DIR} /generated_src/${SHADER} _glsl.h --slang glsl330:hlsl5:metal_macos
150+ OUTPUT " ${CMAKE_CURRENT_BINARY_DIR} /generated_src/${SHADER} _glsl.h"
151+ COMMAND " ${CMAKE_CURRENT_SOURCE_DIR} /third/sokol-tools-bin/bin/win32/sokol-shdc.exe" --input " ${CMAKE_CURRENT_SOURCE_DIR} /src/${SHADER} .glsl" --output " ${CMAKE_CURRENT_BINARY_DIR} /generated_src/${SHADER} _glsl.h" --slang glsl330:hlsl5:metal_macos
151152 COMMENT "Running sokol-shdc for ${SHADER} .glsl"
152153 )
153- list (APPEND PLAYGROUND_SHADERS_SRC ${CMAKE_CURRENT_BINARY_DIR} /generated_src/${SHADER} _glsl.h)
154+ list (APPEND PLAYGROUND_SHADERS_SRC " ${CMAKE_CURRENT_BINARY_DIR} /generated_src/${SHADER} _glsl.h" )
154155endforeach ()
155156add_custom_target (ProcessPlaygroundShaderFiles ALL DEPENDS ${PLAYGROUND_SHADERS_SRC} )
156157
@@ -181,12 +182,12 @@ target_compile_definitions(LabSoundGraphToy PRIVATE
181182target_include_directories (LabSoundGraphToy SYSTEM
182183 PRIVATE third/imgui
183184 PRIVATE third/LabSound/include
184- PRIVATE ${RAPIDJSON_INCL}
185+ PRIVATE " ${RAPIDJSON_INCL} "
185186 PRIVATE third/entt/single_include)
186187
187188target_include_directories (LabSoundGraphToy
188- PRIVATE ${CMAKE_CURRENT_BINARY_DIR} /generated_src
189- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} /src
189+ PRIVATE " ${CMAKE_CURRENT_BINARY_DIR} /generated_src"
190+ PRIVATE " ${CMAKE_CURRENT_SOURCE_DIR} /src"
190191 PRIVATE third/imgui/examples)
191192
192193set_property (TARGET LabSoundGraphToy PROPERTY CXX_STANDARD 17)
@@ -214,59 +215,16 @@ elseif (APPLE)
214215# endif()
215216endif ()
216217
217- # In order to use the LabSound Registry, and LabSound as a static library,
218- # whole archive needs to be specified in order not to deadstrip the static
219- # initializers.
220- # Unfortunately, the developers of cmake have yet to agree that a
221- # whole archive flag is in order, and so this terrible contraption is
222- # necessary.
223- #
224- if (MSVC )
225- target_link_libraries (LabSoundGraphToy
226- ${PLATFORM_LIBS}
227- imgui
228- libnyquist
229- samplerate
230- Lab::Midi
231- Tiny::OSC
232- sokol
233- -WHOLEARCHIVE:$<TARGET_FILE:Lab::Sound>
234- )
235- elseif (CMAKE_COMPILER_IS_GNUCXX)
236- target_link_libraries (LabSoundGraphToy
237- ${PLATFORM_LIBS}
238- imgui
239- libnyquist
240- samplerate
241- Lab::Midi
242- Tiny::OSC
243- sokol
244- -Wl,--whole-archive $<TARGET_FILE:Lab::Sound> -Wl,--no -whole-archive
245- )
246- elseif ("${CMAKE_CXX_COMPILER_ID} " MATCHES "Clang" )
247- target_link_libraries (LabSoundGraphToy
248- ${PLATFORM_LIBS}
249- imgui
250- libnyquist
251- samplerate
252- Lab::Midi
253- Tiny::OSC
254- sokol
255- Lab::Sound
256- )
257- else ()
258- target_link_libraries (LabSoundGraphToy
259- ${PLATFORM_LIBS}
260- imgui
261- libnyquist
262- samplerate
263- Lab::Sound
264- Lab::Midi
265- Tiny::OSC
266- sokol
267- )
268- endif ()
269-
218+ target_link_libraries (LabSoundGraphToy
219+ ${PLATFORM_LIBS}
220+ imgui
221+ libnyquist
222+ samplerate
223+ Lab::Midi
224+ Tiny::OSC
225+ sokol
226+ Lab::Sound
227+ )
270228
271229#-------------------------------------------------------------------------------
272230# Installer
@@ -283,7 +241,8 @@ install(
283241 FILES
284242 resources/fontaudio.ttf
285243 resources/preview.png
286- DESTINATION bin/LabSoundGraphToy_rsrc/)
244+ DESTINATION "${CMAKE_INSTALL_PREFIX} /bin/LabSoundGraphToy_rsrc/"
245+ )
287246
288247install (
289248 FILES
0 commit comments