From cf8d885999ce967531d87c5f1c664e3ffc9aa761 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 6 May 2023 15:13:07 +0200 Subject: [PATCH] Remove use of REAL_BUILD macro Signed-off-by: falkTX --- data/pkgconfig/carla-host-plugin.pc | 2 +- data/pkgconfig/carla-native-plugin.pc | 2 +- data/pkgconfig/carla-standalone.pc | 2 +- data/pkgconfig/carla-utils.pc | 2 +- data/windows/unzipfx-carla-control/unzipfx/appDetails.h | 1 - data/windows/unzipfx-carla/unzipfx/appDetails.h | 1 - source/Makefile.mk | 2 +- source/backend/CarlaBackend.doxygen | 2 +- source/includes/CarlaDefines.h | 5 ----- source/tests/Makefile | 2 +- 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/data/pkgconfig/carla-host-plugin.pc b/data/pkgconfig/carla-host-plugin.pc index 29b952af9..1068224df 100644 --- a/data/pkgconfig/carla-host-plugin.pc +++ b/data/pkgconfig/carla-host-plugin.pc @@ -7,4 +7,4 @@ Name: carla-host-plugin Version: X-VERSION-X Description: Carla Host as Native Plugin Libs: -Wl,-rpath,${carla_libdir} -L${carla_libdir} -lcarla_host-plugin -Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes +Cflags: -I${includedir}/carla -I${includedir}/carla/includes diff --git a/data/pkgconfig/carla-native-plugin.pc b/data/pkgconfig/carla-native-plugin.pc index ade995015..7a2385100 100644 --- a/data/pkgconfig/carla-native-plugin.pc +++ b/data/pkgconfig/carla-native-plugin.pc @@ -6,4 +6,4 @@ Name: carla-native-plugin Version: X-VERSION-X Description: Carla Native Plugin Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_native-plugin -Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes +Cflags: -I${includedir}/carla -I${includedir}/carla/includes diff --git a/data/pkgconfig/carla-standalone.pc b/data/pkgconfig/carla-standalone.pc index 0e1113a2e..88dce2bf5 100644 --- a/data/pkgconfig/carla-standalone.pc +++ b/data/pkgconfig/carla-standalone.pc @@ -6,4 +6,4 @@ Name: carla-standalone Version: X-VERSION-X Description: Carla Host Standalone Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_standalone2 -Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes +Cflags: -I${includedir}/carla -I${includedir}/carla/includes diff --git a/data/pkgconfig/carla-utils.pc b/data/pkgconfig/carla-utils.pc index 1115fbe62..ca55de886 100644 --- a/data/pkgconfig/carla-utils.pc +++ b/data/pkgconfig/carla-utils.pc @@ -6,4 +6,4 @@ Name: carla-utils Version: X-VERSION-X Description: Carla Host Utilities Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_utils -Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes -I${includedir}/carla/utils +Cflags: -I${includedir}/carla -I${includedir}/carla/includes -I${includedir}/carla/utils diff --git a/data/windows/unzipfx-carla-control/unzipfx/appDetails.h b/data/windows/unzipfx-carla-control/unzipfx/appDetails.h index 9cd2f4648..0763231a6 100644 --- a/data/windows/unzipfx-carla-control/unzipfx/appDetails.h +++ b/data/windows/unzipfx-carla-control/unzipfx/appDetails.h @@ -2,7 +2,6 @@ #ifndef __APP_DETAILS_H__ #define __APP_DETAILS_H__ -#define REAL_BUILD #include "../../../../source/includes/CarlaDefines.h" #define SFX_APP_MININAME_TITLE "CarlaControl" diff --git a/data/windows/unzipfx-carla/unzipfx/appDetails.h b/data/windows/unzipfx-carla/unzipfx/appDetails.h index ed4e026c2..c166c1637 100644 --- a/data/windows/unzipfx-carla/unzipfx/appDetails.h +++ b/data/windows/unzipfx-carla/unzipfx/appDetails.h @@ -2,7 +2,6 @@ #ifndef __APP_DETAILS_H__ #define __APP_DETAILS_H__ -#define REAL_BUILD #include "../../../../source/includes/CarlaDefines.h" #define SFX_APP_MININAME_TITLE "Carla" diff --git a/source/Makefile.mk b/source/Makefile.mk index 417e8fcfd..33aa8ddb8 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -22,7 +22,7 @@ include $(CWD)/Makefile.deps.mk # --------------------------------------------------------------------------------------------------------------------- # Set build and link flags -BASE_FLAGS = -Wall -Wextra -pipe -DBUILDING_CARLA -DREAL_BUILD -MD -MP -fno-common +BASE_FLAGS = -Wall -Wextra -pipe -DBUILDING_CARLA -MD -MP -fno-common BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections ifeq ($(WASM),true) diff --git a/source/backend/CarlaBackend.doxygen b/source/backend/CarlaBackend.doxygen index f0f8c3bf2..f88a0b1a0 100644 --- a/source/backend/CarlaBackend.doxygen +++ b/source/backend/CarlaBackend.doxygen @@ -242,7 +242,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = DOXYGEN \ - BUILDING_CARLA REAL_BUILD \ + BUILDING_CARLA \ HAVE_DGL HAVE_LIBLO HAVE_LIBMAGIC HAVE_FLUIDSYNTH HAVE_PROJECTM HAVE_X11 \ HAVE_ZYN_DEPS HAVE_ZYN_UI_DEPS EXPAND_AS_DEFINED = diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h index 65e4e2f3e..c393081c6 100644 --- a/source/includes/CarlaDefines.h +++ b/source/includes/CarlaDefines.h @@ -18,11 +18,6 @@ #ifndef CARLA_DEFINES_H_INCLUDED #define CARLA_DEFINES_H_INCLUDED -/* IDE Helper */ -#ifndef REAL_BUILD -# include "config.h" -#endif - /* Compatibility with non-clang compilers */ #ifndef __has_feature # define __has_feature(x) 0 diff --git a/source/tests/Makefile b/source/tests/Makefile index 344e89792..016bd12e1 100644 --- a/source/tests/Makefile +++ b/source/tests/Makefile @@ -21,7 +21,7 @@ endif # --------------------------------------------------------------------------------------------------------------------- -BASE_FLAGS += -DBUILDING_CARLA -DREAL_BUILD +BASE_FLAGS += -DBUILDING_CARLA BASE_FLAGS += -I. -I.. -I../backend -I../includes -I../modules -I../utils BUILD_CXX_FLAGS += -I$(CWD)/modules