Browse Source

Fix build

Signed-off-by: falkTX <falktx@falktx.com>
pull/1780/head
falkTX 1 year ago
parent
commit
37447c6317
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 15 additions and 10 deletions
  1. +6
    -3
      cmake/CMakeLists.txt
  2. +5
    -7
      source/utils/CarlaMacUtils.hpp
  3. +4
    -0
      source/utils/CarlaMainLoop.hpp

+ 6
- 3
cmake/CMakeLists.txt View File

@@ -87,7 +87,7 @@ function(set_common_target_properties TARGET)
$<$<BOOL:${MSVC}>:/wd4244 /wd4267 /wd4273>
)

if("${C_COMPILER_ID}" MATCHES "GNU")
if(CMAKE_C_COMPILER_ID MATCHES "GNU")
target_link_options(${TARGET}
PRIVATE
-Wl,--no-undefined
@@ -403,7 +403,7 @@ target_include_directories(carla-water

target_link_libraries(carla-water
PRIVATE
$<$<BOOL:${APPLE}>:${APPKIT}>
$<$<BOOL:${APPLE}>:$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>>
$<$<BOOL:${WIN32}>:comdlg32>
$<$<BOOL:${WIN32}>:ole32>
$<$<BOOL:${WIN32}>:winmm>
@@ -441,7 +441,7 @@ target_include_directories(carla-water-files

target_link_libraries(carla-water-files
PRIVATE
$<$<BOOL:${APPLE}>:${APPKIT}>
$<$<BOOL:${APPLE}>:$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>>
$<$<BOOL:${WIN32}>:ole32>
$<$<BOOL:${WIN32}>:winmm>
${CARLA_LIBDL}
@@ -664,6 +664,7 @@ target_link_libraries(carla-discovery-native
carla-water-files
carla-ysfx
PkgConfig::FLUIDSYNTH
${CMAKE_THREAD_LIBS_INIT}
)

target_sources(carla-discovery-native
@@ -694,11 +695,13 @@ target_include_directories(carla-utils

target_link_libraries(carla-utils
PRIVATE
carla-jackbridge
carla-lilv
carla-water-files
carla-ysfx
PkgConfig::FLUIDSYNTH
PkgConfig::X11
${CMAKE_THREAD_LIBS_INIT}
)

target_sources(carla-utils


+ 5
- 7
source/utils/CarlaMacUtils.hpp View File

@@ -31,28 +31,26 @@ typedef const struct __CFString* CFStringRef;
void* CFBundleGetFunctionPointerForName(CFBundleRef, CFStringRef);
}

CARLA_BACKEND_START_NAMESPACE

// --------------------------------------------------------------------------------------------------------------------
// a few public functions

/*
* ...
*/
CARLA_PLUGIN_EXPORT void initStandaloneApplication();
CARLA_API void initStandaloneApplication();

/*
* ...
*/
CARLA_PLUGIN_EXPORT const char* findBinaryInBundle(const char* const bundleDir);
CARLA_API const char* findBinaryInBundle(const char* const bundleDir);

/*
* ...
*/
CARLA_PLUGIN_EXPORT bool removeFileFromQuarantine(const char* const filename);
CARLA_API bool removeFileFromQuarantine(const char* const filename);

// --------------------------------------------------------------------------------------------------------------------
// and now then private stuff

CARLA_BACKEND_START_NAMESPACE

/*
* ...


+ 4
- 0
source/utils/CarlaMainLoop.hpp View File

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


Loading…
Cancel
Save