LADI
/
carla
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-05-24 04:01:55 +02:00
parent 9d54dbee9d
commit 37447c6317
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/CMakeLists.txt
View File

@ -87,7 +87,7 @@ function(set_common_target_properties TARGET)
$<$<BOOL:${MSVC}>:/wd4244 /wd4267 /wd4273> $<$<BOOL:${MSVC}>:/wd4244 /wd4267 /wd4273>
) )
if("${C_COMPILER_ID}" MATCHES "GNU") if(CMAKE_C_COMPILER_ID MATCHES "GNU")
target_link_options(${TARGET} target_link_options(${TARGET}
PRIVATE PRIVATE
-Wl,--no-undefined -Wl,--no-undefined
@ -403,7 +403,7 @@ target_include_directories(carla-water
target_link_libraries(carla-water target_link_libraries(carla-water
PRIVATE PRIVATE
$<$<BOOL:${APPLE}>:${APPKIT}> $<$<BOOL:${APPLE}>:$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>>
$<$<BOOL:${WIN32}>:comdlg32> $<$<BOOL:${WIN32}>:comdlg32>
$<$<BOOL:${WIN32}>:ole32> $<$<BOOL:${WIN32}>:ole32>
$<$<BOOL:${WIN32}>:winmm> $<$<BOOL:${WIN32}>:winmm>
@ -441,7 +441,7 @@ target_include_directories(carla-water-files
target_link_libraries(carla-water-files target_link_libraries(carla-water-files
PRIVATE PRIVATE
$<$<BOOL:${APPLE}>:${APPKIT}> $<$<BOOL:${APPLE}>:$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>>
$<$<BOOL:${WIN32}>:ole32> $<$<BOOL:${WIN32}>:ole32>
$<$<BOOL:${WIN32}>:winmm> $<$<BOOL:${WIN32}>:winmm>
${CARLA_LIBDL} ${CARLA_LIBDL}
@ -664,6 +664,7 @@ target_link_libraries(carla-discovery-native
carla-water-files carla-water-files
carla-ysfx carla-ysfx
PkgConfig::FLUIDSYNTH PkgConfig::FLUIDSYNTH
${CMAKE_THREAD_LIBS_INIT}
) )
target_sources(carla-discovery-native target_sources(carla-discovery-native
@ -694,11 +695,13 @@ target_include_directories(carla-utils
target_link_libraries(carla-utils target_link_libraries(carla-utils
PRIVATE PRIVATE
carla-jackbridge
carla-lilv carla-lilv
carla-water-files carla-water-files
carla-ysfx carla-ysfx
PkgConfig::FLUIDSYNTH PkgConfig::FLUIDSYNTH
PkgConfig::X11 PkgConfig::X11
${CMAKE_THREAD_LIBS_INIT}
) )
target_sources(carla-utils target_sources(carla-utils

40
source/utils/CarlaMacUtils.hpp
View File

@ -31,29 +31,27 @@ typedef const struct __CFString* CFStringRef;
void* CFBundleGetFunctionPointerForName(CFBundleRef, CFStringRef); void* CFBundleGetFunctionPointerForName(CFBundleRef, CFStringRef);
} }
// --------------------------------------------------------------------------------------------------------------------
// a few public functions
/*
* ...
*/
CARLA_PLUGIN_EXPORT void initStandaloneApplication();
/*
* ...
*/
CARLA_PLUGIN_EXPORT const char* findBinaryInBundle(const char* const bundleDir);
/*
* ...
*/
CARLA_PLUGIN_EXPORT bool removeFileFromQuarantine(const char* const filename);
// --------------------------------------------------------------------------------------------------------------------
// and now then private stuff
CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE
// --------------------------------------------------------------------------------------------------------------------
/*
* ...
*/
CARLA_API void initStandaloneApplication();
/*
* ...
*/
CARLA_API const char* findBinaryInBundle(const char* const bundleDir);
/*
* ...
*/
CARLA_API bool removeFileFromQuarantine(const char* const filename);
// --------------------------------------------------------------------------------------------------------------------
/* /*
* ... * ...
*/ */

4
source/utils/CarlaMainLoop.hpp
View File

@ -40,7 +40,11 @@ bool runMainLoopOnce()
for (;;) for (;;)
{ {
event = [NSApp event = [NSApp
#ifdef __MAC_10_12
nextEventMatchingMask:NSEventMaskAny
#else
nextEventMatchingMask:NSAnyEventMask nextEventMatchingMask:NSAnyEventMask
#endif
untilDate:date untilDate:date
inMode:NSDefaultRunLoopMode inMode:NSDefaultRunLoopMode
dequeue:YES]; dequeue:YES];