Browse Source

Fix XCode project

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2432 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 14 years ago
parent
commit
5da7de955e
2 changed files with 28 additions and 13 deletions
  1. +22
    -7
      macosx/Jackdmp.xcodeproj/project.pbxproj
  2. +6
    -6
      tests/testMutex.cpp

+ 22
- 7
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -7835,6 +7835,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
CoreAudio,
@@ -7870,6 +7871,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
CoreAudio,
@@ -7902,6 +7904,7 @@
x86_64,
);
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
AudioToolBox,
@@ -7940,6 +7943,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
CoreAudio,
@@ -7975,6 +7979,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
CoreAudio,
@@ -8007,6 +8012,7 @@
x86_64,
);
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
AudioToolBox,
@@ -8045,6 +8051,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
CoreAudio,
@@ -8080,6 +8087,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
CoreAudio,
@@ -8112,6 +8120,7 @@
x86_64,
);
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
AudioToolBox,
@@ -8160,7 +8169,7 @@
MACH_O_TYPE = mh_dylib;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
Jackdmp,
@@ -8207,7 +8216,7 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
Jackservermp,
@@ -8251,7 +8260,7 @@
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
Jackdmp,
@@ -8303,7 +8312,7 @@
MACH_O_TYPE = mh_dylib;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
libportaudio.a,
"-framework",
@@ -8354,7 +8363,7 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
libportaudio.a,
"-framework",
@@ -8402,7 +8411,7 @@
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
libportaudio.a,
"-framework",
@@ -8453,6 +8462,7 @@
MACH_O_TYPE = mh_dylib;
OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
Jackdmp,
@@ -8498,6 +8508,7 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
Jackservermp,
@@ -8540,6 +8551,7 @@
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_LDFLAGS = (
"-framework",
Jackdmp,
@@ -9073,7 +9085,10 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = ../common;
HEADER_SEARCH_PATHS = (
/opt/local/include,
../common,
);
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"-framework",


+ 6
- 6
tests/testMutex.cpp View File

@@ -29,14 +29,14 @@

#include "JackPosixThread.h"
#include "JackMutex.h"
#include <jack/thread.h>
#include "thread.h"

using namespace Jack;

static void CleanupHandler(void * arg)
{
JackLockAble* locked = (JackLockAble*)arg;
printf("CleanupHandler locked %x \n", locked);
printf("CleanupHandler locked %px \n", locked);
locked->Unlock();
}

@@ -92,7 +92,7 @@ struct LockedObject : public JackLockAble {
fCount++;
//printf("LockedMethod1 self %x fCount %d\n", pthread_self(), fCount);
if (fCount >= 1000) {
printf("Terminate self = %x count = %d\n", pthread_self(), fCount);
printf("Terminate self = %px count = %d\n", pthread_self(), fCount);
pthread_exit(NULL);
}
Unlock();
@@ -107,7 +107,7 @@ struct LockedObject : public JackLockAble {
fCount++;
//printf("LockedMethod2 self %x fCount %d\n", pthread_self(), fCount);
if (fCount >= 1500) {
printf("Terminate self = %x count = %d\n", pthread_self(), fCount);
printf("Terminate self = %px count = %d\n", pthread_self(), fCount);
pthread_exit(NULL);
}
Unlock();
@@ -122,7 +122,7 @@ struct LockedObject : public JackLockAble {
fCount++;
//printf("LockedMethod3 self %x fCount %d\n", pthread_self(), fCount);
if (fCount >= 3000) {
printf("Terminate self = %x count = %d\n", pthread_self(), fCount);
printf("Terminate self = %px count = %d\n", pthread_self(), fCount);
pthread_exit(NULL);
}
Unlock();
@@ -149,7 +149,7 @@ struct TestThread : public JackRunnableInterface {

virtual ~TestThread()
{
printf("DELETE %x\n", fThread);
printf("DELETE %px\n", fThread);
fThread->Kill();
delete fThread;
}


Loading…
Cancel
Save