hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

remnants of master merge

Browse Source
This commit is contained in:
Rossmaxx
2024-07-15 16:50:32 +05:30
parent b5b6e2dafe
commit 7d70c8b090
3 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ZynAddSubFx/CMakeLists.txt
View File

@@ -111,15 +111,6 @@ set_target_properties(zynaddsubfx_nio PROPERTIES SYSTEM TRUE)
set_target_properties(zynaddsubfx_gui PROPERTIES SYSTEM TRUE)
set_target_properties(zynaddsubfx_synth PROPERTIES SYSTEM TRUE)
<<<<<<< HEAD
if(MINGW)
target_link_libraries(zynaddsubfx_nio PUBLIC mingw_stdthreads)
target_link_libraries(zynaddsubfx_gui PUBLIC mingw_stdthreads)
target_link_libraries(zynaddsubfx_synth PUBLIC mingw_stdthreads)
endif()
=======
>>>>>>> master
# Relative include paths don't work automatically for the GUI, because the
# generated C++ files aren't in the source directory. Thus, add the expected
# source directory as an additional include directory.