From 3e01068967e8bff63f27e36ea76eacbcd17bfb38 Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 5 Sep 2008 13:36:28 +0000 Subject: Merge Michael Voigt drops branch after reorganization step. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2880 0c269be4-1314-0410-8aa9-9f06e86f4224 --- tests/testSem.cpp | 2 +- tests/testSynchroClient.cpp | 2 +- tests/testSynchroServer.cpp | 2 +- tests/testSynchroServerClient.cpp | 4 +--- tests/wscript | 5 ++++- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/testSem.cpp b/tests/testSem.cpp index f26a8473..a3e9c4c0 100644 --- a/tests/testSem.cpp +++ b/tests/testSem.cpp @@ -29,7 +29,7 @@ #include "JackPosixSemaphore.h" #include "JackFifo.h" -#include "JackPlatformThread.h" +#include "JackPlatformPlug.h" #define ITER 500000 diff --git a/tests/testSynchroClient.cpp b/tests/testSynchroClient.cpp index 6ffbe325..6da201c5 100644 --- a/tests/testSynchroClient.cpp +++ b/tests/testSynchroClient.cpp @@ -47,7 +47,7 @@ #include "JackFifo.h" #endif -#include "JackPlatformThread.h" +#include "JackPlatformPlug.h" #define ITER 1000 diff --git a/tests/testSynchroServer.cpp b/tests/testSynchroServer.cpp index a43b882c..561988d3 100644 --- a/tests/testSynchroServer.cpp +++ b/tests/testSynchroServer.cpp @@ -47,7 +47,7 @@ #include "JackFifo.h" #endif -#include "JackPlatformThread.h" +#include "JackPlatformPlug.h" #define ITER 1000 diff --git a/tests/testSynchroServerClient.cpp b/tests/testSynchroServerClient.cpp index 8372a555..1e1f4609 100644 --- a/tests/testSynchroServerClient.cpp +++ b/tests/testSynchroServerClient.cpp @@ -47,15 +47,13 @@ #include "JackFifo.h" #endif -#include "JackPlatformThread.h" +#include "JackPlatformPlug.h" #define ITER 100000 #define SERVER "serveur1" #define CLIENT "client1" -#include "JackPlatformSynchro.h" - using namespace Jack; #ifdef WIN32 diff --git a/tests/wscript b/tests/wscript index daf94ceb..fcccc3b1 100644 --- a/tests/wscript +++ b/tests/wscript @@ -14,7 +14,10 @@ def build(bld): for test_program, test_program_sources in test_programs.items(): prog = bld.create_obj('cpp', 'program') prog.features.append('cc') - prog.includes = ['../macosx', '../common/jack', '../common'] + if bld.env()['IS_MACOSX']: + prog.includes = ['../macosx', '../posix', '../common/jack', '../common'] + if bld.env()['IS_LINUX']: + prog.includes = ['../linux', '../posix', '../common/jack', '../common'] prog.source = test_program_sources if bld.env()['IS_LINUX']: prog.uselib = 'RT' -- cgit v1.2.1