Browse Source

Fix build

tags/1.9.4
falkTX 12 years ago
parent
commit
0997b4b1b9
2 changed files with 14 additions and 6 deletions
  1. +11
    -5
      source/discovery/Makefile
  2. +3
    -1
      source/discovery/carla-discovery.cpp

+ 11
- 5
source/discovery/Makefile View File

@@ -48,11 +48,17 @@ WIN_32BIT_FLAGS = $(32BIT_FLAGS)
WIN_64BIT_FLAGS = $(64BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS)
WIN_LINK_FLAGS = $(LINK_FLAGS) $(EXTRA_LIBS) -lole32 -lshlwapi -lversion -lwininet -lwinmm -lws2_32 WIN_LINK_FLAGS = $(LINK_FLAGS) $(EXTRA_LIBS) -lole32 -lshlwapi -lversion -lwininet -lwinmm -lws2_32


LIBS = ../modules/juce_core.a
LIBS_posix32 = ../modules/juce_core.posix32.a
LIBS_posix64 = ../modules/juce_core.posix64.a
LIBS_win32 = ../modules/juce_core.win32.a
LIBS_win64 = ../modules/juce_core.win64.a
LIBS = ../modules/juce_audio_basics.a
LIBS_posix32 = ../modules/juce_audio_basics.posix32.a
LIBS_posix64 = ../modules/juce_audio_basics.posix64.a
LIBS_win32 = ../modules/juce_audio_basics.win32.a
LIBS_win64 = ../modules/juce_audio_basics.win64.a

LIBS += ../modules/juce_core.a
LIBS_posix32 += ../modules/juce_core.posix32.a
LIBS_posix64 += ../modules/juce_core.posix64.a
LIBS_win32 += ../modules/juce_core.win32.a
LIBS_win64 += ../modules/juce_core.win64.a


ifeq ($(CARLA_PLUGIN_SUPPORT),true) ifeq ($(CARLA_PLUGIN_SUPPORT),true)
LIBS += ../modules/lilv.a LIBS += ../modules/lilv.a


+ 3
- 1
source/discovery/carla-discovery.cpp View File

@@ -44,12 +44,14 @@
# undef TMP__cplusplus # undef TMP__cplusplus
#endif #endif


#include "juce_core.h"
#include "juce_audio_basics.h"


#include <iostream> #include <iostream>


#define DISCOVERY_OUT(x, y) std::cout << "\ncarla-discovery::" << x << "::" << y << std::endl; #define DISCOVERY_OUT(x, y) std::cout << "\ncarla-discovery::" << x << "::" << y << std::endl;


using juce::FloatVectorOperations;

CARLA_BACKEND_USE_NAMESPACE CARLA_BACKEND_USE_NAMESPACE


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


Loading…
Cancel
Save