diff --git a/common/JackAudioAdapterInterface.cpp b/common/JackAudioAdapterInterface.cpp index f765d032..fed62e03 100644 --- a/common/JackAudioAdapterInterface.cpp +++ b/common/JackAudioAdapterInterface.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #endif #include "JackAudioAdapter.h" -#ifndef TARGET_OS_IPHONE +#ifndef MY_TARGET_OS_IPHONE #include "JackLibSampleRateResampler.h" #endif #include "JackTime.h" @@ -194,7 +194,7 @@ namespace Jack fRunning = false; } -#ifdef TARGET_OS_IPHONE +#ifdef MY_TARGET_OS_IPHONE void JackAudioAdapterInterface::Create() {} #else diff --git a/common/JackFilters.h b/common/JackFilters.h index ad2afecc..ac9de9f9 100644 --- a/common/JackFilters.h +++ b/common/JackFilters.h @@ -25,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #endif #include "jack.h" -#ifndef TARGET_OS_IPHONE +#ifndef MY_TARGET_OS_IPHONE #include "JackAtomicState.h" #endif #include diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index 185e0da6..d8833e09 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -877,7 +877,7 @@ SERVER_EXPORT int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** in } -#ifdef TARGET_OS_IPHONE +#ifdef MY_TARGET_OS_IPHONE static void jack_format_and_log(int level, const char *prefix, const char *fmt, va_list ap) { diff --git a/macosx/JackMachThread.cpp b/macosx/JackMachThread.cpp index 9692bdb9..61b67b43 100644 --- a/macosx/JackMachThread.cpp +++ b/macosx/JackMachThread.cpp @@ -31,7 +31,7 @@ int JackMachThread::SetThreadToPriority(pthread_t thread, UInt32 inPriority, Boo // REAL-TIME / TIME-CONSTRAINT THREAD thread_time_constraint_policy_data_t theTCPolicy; -#ifdef TARGET_OS_IPHONE +#ifdef MY_TARGET_OS_IPHONE theTCPolicy.period = 0; theTCPolicy.computation = 0; theTCPolicy.constraint = 0; @@ -138,7 +138,7 @@ int JackMachThread::GetParams(pthread_t thread, UInt64* period, UInt64* computat &count, &get_default); if (res == KERN_SUCCESS) { - #ifdef TARGET_OS_IPHONE + #ifdef MY_TARGET_OS_IPHONE *period = 0; *computation = 0; *constraint = 0; diff --git a/macosx/JackMachThread.h b/macosx/JackMachThread.h index ac96f4a0..d25331d2 100644 --- a/macosx/JackMachThread.h +++ b/macosx/JackMachThread.h @@ -63,19 +63,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#ifdef TARGET_OS_IPHONE +#ifdef MY_TARGET_OS_IPHONE typedef unsigned char Boolean; #endif #include "JackPosixThread.h" -#ifndef TARGET_OS_IPHONE +#ifndef MY_TARGET_OS_IPHONE #import #endif #include #include -#ifndef TARGET_OS_IPHONE +#ifndef MY_TARGET_OS_IPHONE #include #endif diff --git a/macosx/JackPlatformPlug_os.h b/macosx/JackPlatformPlug_os.h index df7f0175..d8cc1ca3 100644 --- a/macosx/JackPlatformPlug_os.h +++ b/macosx/JackPlatformPlug_os.h @@ -33,6 +33,13 @@ namespace Jack class JackMachServerNotifyChannel; class JackMachNotifyChannel; class JackNetUnixSocket; + +#ifdef MY_TARGET_OS_IPHONE + class JackClient; + class JackGraphManager; + class JackEngineControl; + class JackSynchro; +#endif } /* __JackPlatformMutex__ */ @@ -44,7 +51,7 @@ namespace Jack { typedef JackPosixMutex JackMutex; } namespace Jack { typedef JackMachThread JackThread; } /* __JackPlatformSynchro__ client activation */ -#ifndef TARGET_OS_IPHONE +#ifndef MY_TARGET_OS_IPHONE #include "JackMachSemaphore.h" namespace Jack { typedef JackMachSemaphore JackSynchro; } #endif @@ -53,7 +60,7 @@ namespace Jack { typedef JackMachSemaphore JackSynchro; } #include "JackProcessSync.h" /* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */ -#ifndef TARGET_OS_IPHONE +#ifndef MY_TARGET_OS_IPHONE /* __JackPlatformServerChannel__ */ #include "JackMachServerChannel.h" namespace Jack { typedef JackMachServerChannel JackServerChannel; } diff --git a/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj b/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj index a1211fef..71611610 100755 --- a/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj +++ b/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj @@ -719,6 +719,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREFIX_HEADER = iPhoneNet_Prefix.pch; HEADER_SEARCH_PATHS = ( ../../common/jack, ../../common, @@ -739,6 +740,13 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_PREFIX_HEADER = iPhoneNet_Prefix.pch; + HEADER_SEARCH_PATHS = ( + ../../macosx, + ../../posix, + ../../common, + ../../common/jack, + ); PREBINDING = NO; PRODUCT_NAME = jacknet; ZERO_LINK = NO; diff --git a/macosx/iphone/iPhoneNet_Prefix.pch b/macosx/iphone/iPhoneNet_Prefix.pch index 8de611d5..55c63732 100644 --- a/macosx/iphone/iPhoneNet_Prefix.pch +++ b/macosx/iphone/iPhoneNet_Prefix.pch @@ -6,3 +6,5 @@ #import #import #endif + +#define MY_TARGET_OS_IPHONE 1