Browse Source

Fix windows build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 3 years ago
parent
commit
f07987ba4f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 37 additions and 4 deletions
  1. +1
    -1
      carla
  2. +1
    -1
      dpf
  3. +3
    -0
      plugins/Common/IldaeilPlugin.cpp
  4. +20
    -1
      plugins/Common/IldaeilUI.cpp
  5. +12
    -1
      plugins/Common/Makefile.mk

+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit ac8e58f84d0f2b57f7ee22f9f4f8b29eacd3512f
Subproject commit 51028655d09c9a21fc51cadd7bc48210295aa791

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 306c680c6ecb3241011ce46dbe27824e8c7189fc
Subproject commit d56d568e7650069ad74dc713fb0680b952a4a4f1

+ 3
- 0
plugins/Common/IldaeilPlugin.cpp View File

@@ -22,6 +22,9 @@
#include "DistrhoPlugin.hpp"
// generates a warning if this is defined as anything else
#define CARLA_API
START_NAMESPACE_DISTRHO
// --------------------------------------------------------------------------------------------------------------------


+ 20
- 1
plugins/Common/IldaeilUI.cpp View File

@@ -27,6 +27,25 @@

#include <vector>

// strcasestr
#ifdef DISTRHO_OS_WINDOWS
# include <shlwapi.h>
namespace ildaeil {
inline const char* strcasestr(const char* const haystack, const char* const needle)
{
return StrStrIA(haystack, needle);
}
// using strcasestr = StrStrIA;
}
#else
namespace ildaeil {
using ::strcasestr;
}
#endif

// generates a warning if this is defined as anything else
#define CARLA_API

START_NAMESPACE_DISTRHO

// --------------------------------------------------------------------------------------------------------------------
@@ -859,7 +878,7 @@ protected:
{
const PluginInfoCache& info(fPlugins[i]);

if (search != nullptr && strcasestr(info.name, search) == nullptr)
if (search != nullptr && ildaeil::strcasestr(info.name, search) == nullptr)
continue;

bool selected = fPluginSelected == i;


+ 12
- 1
plugins/Common/Makefile.mk View File

@@ -31,6 +31,9 @@ CARLA_BUILD_TYPE = Release
endif

EXTRA_LIBS = $(CARLA_BUILD_DIR)/plugin/$(CARLA_BUILD_TYPE)/carla-host-plugin.cpp.o
ifneq ($(MACOS),true)
EXTRA_LIBS += -Wl,--start-group -Wl,--whole-archive
endif
EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_plugin.a
EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
@@ -53,6 +56,14 @@ ifeq ($(USING_JUCE_GUI_EXTRA),true)
EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_gui_extra.a
endif
endif
ifneq ($(MACOS),true)
EXTRA_LIBS += -Wl,--no-whole-archive -Wl,--end-group
endif

# FIXME patch fluidsynth package
ifeq ($(WIN32),true)
STATIC_CARLA_PLUGIN_LIBS += -ldsound -lwinmm
endif

# --------------------------------------------------------------
# Do some more magic
@@ -71,7 +82,7 @@ BUILD_CXX_FLAGS += -I../../carla/source/includes
BUILD_CXX_FLAGS += -I../../carla/source/modules
BUILD_CXX_FLAGS += -I../../carla/source/utils

LINK_FLAGS += $(STATIC_CARLA_PLUGIN_LIBS)
EXTRA_LIBS += $(STATIC_CARLA_PLUGIN_LIBS)

ifeq ($(MACOS),true)
$(BUILD_DIR)/../Common/PluginHostWindow.cpp.o: BUILD_CXX_FLAGS += -ObjC++


Loading…
Cancel
Save