Browse Source

Misc

tags/1.9.4
falkTX 11 years ago
parent
commit
05fd918aca
4 changed files with 9 additions and 3 deletions
  1. +2
    -1
      .gitignore
  2. +3
    -1
      source/libs/jackbridge/JackBridge2.cpp
  3. +1
    -1
      source/libs/jackbridge/Makefile
  4. +3
    -0
      source/tests/Makefile

+ 2
- 1
.gitignore View File

@@ -67,6 +67,7 @@ source/tests/ANSI
source/tests/Base64
source/tests/CarlaString
source/tests/Print
source/tests/Rewire.cpp
source/tests/RtList
source/tests/Thread
source/tests/Utils
@@ -118,6 +119,6 @@ source/backend/native/zynaddsubfx/UI/VirKeyboard.cpp
source/backend/native/zynaddsubfx/UI/VirKeyboard.h

# Other
source/includes/rewire/
source/includes/vst/
source/includes/vst3/
source/libs/jackbridge/jack

+ 3
- 1
source/libs/jackbridge/JackBridge2.cpp View File

@@ -16,7 +16,7 @@

#include "CarlaDefines.hpp"

// don't include the whole JACK deal in this file
// don't include the whole JACK API in this file
CARLA_EXPORT bool jackbridge_sem_post(void* sem);
CARLA_EXPORT bool jackbridge_sem_timedwait(void* sem, int secs);

@@ -80,3 +80,5 @@ bool jackbridge_sem_timedwait(void* sem, int secs)
# endif
}
#endif

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

+ 1
- 1
source/libs/jackbridge/Makefile View File

@@ -29,7 +29,7 @@ WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wi
WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
WINE_LINK_FLAGS = $(LINK_FLAGS) -ldl -lrt -lpthread -ljack

OBJS = JackBridge2.cpp JackBridge1.cpp
OBJS = JackBridge1.cpp JackBridge2.cpp

# --------------------------------------------------------------



+ 3
- 0
source/tests/Makefile View File

@@ -41,6 +41,9 @@ Print: Print.cpp
Utils: Utils.cpp
$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -o $@

Rewire.exe: Rewire.cpp
$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -lversion -o $@

RUN: $(TARGETS)
# valgrind ./Base64
# ./ANSI


Loading…
Cancel
Save