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

Adjust installed utils to work without any special macros 

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

2
source/backend/utils/CarlaUtils.cpp
View File

@ -17,6 +17,8 @@
#include "CarlaUtils.hpp"
#include "CarlaProcessUtils.cpp"
#ifndef CARLA_OS_WASM
# include "CarlaBridgeUtils.cpp"
#endif

10
source/utils/CarlaBinaryUtils.hpp
View File

@ -21,11 +21,11 @@
#include "CarlaBackend.h"
#include "CarlaScopeUtils.hpp"
#if defined(CARLA_UTILS_USE_QT)
#if defined(BUILDING_CARLA)
# include "water/files/FileInputStream.h"
#elif defined(CARLA_UTILS_USE_QT)
# include <QtCore/QFile>
# include <QtCore/QString>
#else
# include "water/files/FileInputStream.h"
#endif
#if defined(HAVE_LIBMAGIC) && ! defined(BUILD_BRIDGE_ALTERNATIVE_ARCH)
@ -132,6 +132,7 @@ BinaryType getBinaryTypeFromFile(const char* const filename)
}
#endif
#if defined(BUILDING_CARLA) || defined(CARLA_UTILS_USE_QT)
#if defined(CARLA_UTILS_USE_QT)
QFile file(QString::fromUtf8(filename));
CARLA_SAFE_ASSERT_RETURN(file.open(QIODevice::ReadOnly), BINARY_NATIVE);
@ -192,6 +193,9 @@ BinaryType getBinaryTypeFromFile(const char* const filename)
default:
return BINARY_NATIVE;
}
#else
return BINARY_NATIVE;
#endif
}
// --------------------------------------------------------------------------------------------------------------------