Browse Source

Build our obj-c code with different class names per build target

tags/1.9.8
falkTX 8 years ago
parent
commit
54094ef995
4 changed files with 17 additions and 4 deletions
  1. +2
    -1
      source/backend/CarlaStandalone.cpp
  2. +2
    -1
      source/backend/engine/CarlaEngineNative.cpp
  3. +2
    -1
      source/bridges-ui/CarlaBridgeToolkitNative.cpp
  4. +11
    -1
      source/utils/CarlaPluginUI.cpp

+ 2
- 1
source/backend/CarlaStandalone.cpp View File

@@ -1,6 +1,6 @@
/*
* Carla Standalone
* Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2011-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -1998,6 +1998,7 @@ const char* carla_get_host_osc_url_udp()

// -------------------------------------------------------------------------------------------------------------------

#define CARLA_PLUGIN_UI_CLASS_PREFIX Standalone
#include "CarlaPluginUI.cpp"
#include "CarlaDssiUtils.cpp"
#include "CarlaPatchbayUtils.cpp"


+ 2
- 1
source/backend/engine/CarlaEngineNative.cpp View File

@@ -1,6 +1,6 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2011-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -2323,6 +2323,7 @@ const EngineDriverDeviceInfo* CarlaEngine::getRtAudioDeviceInfo(const uint, cons

CARLA_BACKEND_END_NAMESPACE

#define CARLA_PLUGIN_UI_CLASS_PREFIX EngineNative
#include "CarlaHostCommon.cpp"
#include "CarlaPluginUI.cpp"
#include "CarlaDssiUtils.cpp"


+ 2
- 1
source/bridges-ui/CarlaBridgeToolkitNative.cpp View File

@@ -1,6 +1,6 @@
/*
* Carla Bridge UI
* Copyright (C) 2014-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2014-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -224,6 +224,7 @@ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const forma

CARLA_BRIDGE_UI_END_NAMESPACE

#define CARLA_PLUGIN_UI_CLASS_PREFIX ToolkitNative
#include "CarlaPluginUI.cpp"

// -------------------------------------------------------------------------

+ 11
- 1
source/utils/CarlaPluginUI.cpp View File

@@ -1,6 +1,6 @@
/*
* Carla Plugin UI
* Copyright (C) 2014-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2014-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -33,6 +33,10 @@
# include <ctime>
#endif

#ifndef CARLA_PLUGIN_UI_CLASS_PREFIX
# error CARLA_PLUGIN_UI_CLASS_PREFIX undefined
#endif

// ---------------------------------------------------------------------------------------------------------------------
// X11

@@ -359,6 +363,12 @@ private:

#ifdef CARLA_OS_MAC

#ifdef BUILD_BRIDGE
# define CarlaPluginWindow CarlaPluginWindowBridged ## CARLA_PLUGIN_UI_CLASS_PREFIX ## CARLA_VERSION_HEX
#else
# define CarlaPluginWindow CarlaPluginWindow ## CARLA_PLUGIN_UI_CLASS_PREFIX ## CARLA_VERSION_HEX
#endif

@interface CarlaPluginWindow : NSWindow
{
@public


Loading…
Cancel
Save