diff --git a/common/SC_fftlib.cpp b/common/SC_fftlib.cpp index f1602ed531..75ac65daf1 100644 --- a/common/SC_fftlib.cpp +++ b/common/SC_fftlib.cpp @@ -38,6 +38,8 @@ For speed we keep this global, although this makes the code non-thread-safe. // We include vDSP even if not using for FFT, since we want to use some vectorised add/mul tricks #if defined(__APPLE__) && !defined(SC_IPHONE) #include "vecLib/vDSP.h" +#elif defined(SC_IPHONE) + #include #endif //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -54,7 +56,7 @@ For speed we keep this global, although this makes the code non-thread-safe. #define SC_FFT_FFTW 0 #define SC_FFT_VDSP 0 #define SC_FFT_GREEN 1 -#elif !SC_FFT_FFTW && defined(__APPLE__) && !defined(SC_IPHONE) && !defined(SUPERNOVA) +#elif !SC_FFT_FFTW && defined(__APPLE__) && !defined(SUPERNOVA) #define SC_FFT_FFTW 0 #define SC_FFT_VDSP 1 #define SC_FFT_GREEN 0 diff --git a/platform/iphone/iPhone_Language.xcodeproj/project.pbxproj b/platform/iphone/iPhone_Language.xcodeproj/project.pbxproj index c248f95515..113c341317 100755 --- a/platform/iphone/iPhone_Language.xcodeproj/project.pbxproj +++ b/platform/iphone/iPhone_Language.xcodeproj/project.pbxproj @@ -83,8 +83,9 @@ 7725B4BD1191E0510056CA2F /* SuperCollider_BrowserPage.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7725B4BC1191E0510056CA2F /* SuperCollider_BrowserPage.xib */; }; 772C0EA012DA0D6F009C0126 /* SC_fftlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772C0E9A12DA0CCA009C0126 /* SC_fftlib.cpp */; }; 772C0F3312DA126F009C0126 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77BA5239129C374C00CE89DD /* MediaPlayer.framework */; }; - 7752352312F59638005AE5FE /* scUBlibsndfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 77597AEF1123323800D2A968 /* scUBlibsndfile.a */; }; + 774770CF12FDE7EB007449B3 /* scUBlibsndfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 77597AEF1123323800D2A968 /* scUBlibsndfile.a */; }; 775574050FBE45A500192282 /* SuperCollider_FileTransfer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 775574040FBE45A500192282 /* SuperCollider_FileTransfer.xib */; }; + 7759955312FDE20A00603187 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7759955212FDE20A00603187 /* Accelerate.framework */; }; 776B2A97119075EF001F253D /* JITLib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 776B2A70119075EC001F253D /* JITLib */; }; 778F12C10F50A92100CB6629 /* sounds in CopyFiles */ = {isa = PBXBuildFile; fileRef = 778F129F0F50A92100CB6629 /* sounds */; }; 778F12C30F50A92100CB6629 /* patches in CopyFiles */ = {isa = PBXBuildFile; fileRef = 778F12AD0F50A92100CB6629 /* patches */; }; @@ -416,6 +417,7 @@ 775574040FBE45A500192282 /* SuperCollider_FileTransfer.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SuperCollider_FileTransfer.xib; path = "iPhone Resources/SuperCollider_FileTransfer.xib"; sourceTree = ""; }; 77597AEA1123320700D2A968 /* libsndfile_iphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsndfile_iphone.a; path = lib/libsndfile_iphone.a; sourceTree = ""; }; 77597AEF1123323800D2A968 /* scUBlibsndfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = scUBlibsndfile.a; path = ../mac/lib/scUBlibsndfile.a; sourceTree = SOURCE_ROOT; }; + 7759955212FDE20A00603187 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; 776B2A70119075EC001F253D /* JITLib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = JITLib; path = ../../SCClassLibrary/JITLib; sourceTree = SOURCE_ROOT; }; 778F129F0F50A92100CB6629 /* sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sounds; path = "iPhone Resources/sounds"; sourceTree = ""; }; 778F12AD0F50A92100CB6629 /* patches */ = {isa = PBXFileReference; lastKnownFileType = folder; name = patches; path = "iPhone Resources/patches"; sourceTree = ""; }; @@ -451,7 +453,8 @@ 77BA523C129C375700CE89DD /* UIKit.framework in Frameworks */, 77BA523E129C376000CE89DD /* Foundation.framework in Frameworks */, 772C0F3312DA126F009C0126 /* MediaPlayer.framework in Frameworks */, - 7752352312F59638005AE5FE /* scUBlibsndfile.a in Frameworks */, + 7759955312FDE20A00603187 /* Accelerate.framework in Frameworks */, + 774770CF12FDE7EB007449B3 /* scUBlibsndfile.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -931,6 +934,7 @@ children = ( 77597AEA1123320700D2A968 /* libsndfile_iphone.a */, 77597AEF1123323800D2A968 /* scUBlibsndfile.a */, + 7759955212FDE20A00603187 /* Accelerate.framework */, 77BA5222129C371F00CE89DD /* CFNetwork.framework */, 77BA5233129C373400CE89DD /* CoreFoundation.framework */, 77BA5235129C373B00CE89DD /* CoreGraphics.framework */, @@ -1134,10 +1138,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - SC_IPHONE, - SC_FFT_GREEN, - ); + GCC_PREPROCESSOR_DEFINITIONS = SC_IPHONE; GCC_THUMB_SUPPORT = NO; GCC_VERSION = 4.2; INFOPLIST_FILE = "iPhone Resources/SuperCollider.plist"; @@ -1174,7 +1175,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( SC_IPHONE, NDEBUG, - SC_FFT_GREEN, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_THUMB_SUPPORT = NO; diff --git a/platform/iphone/iPhone_Synth.xcodeproj/project.pbxproj b/platform/iphone/iPhone_Synth.xcodeproj/project.pbxproj index 56ce9d4554..7e96734289 100755 --- a/platform/iphone/iPhone_Synth.xcodeproj/project.pbxproj +++ b/platform/iphone/iPhone_Synth.xcodeproj/project.pbxproj @@ -19,6 +19,12 @@ 772C0F0312DA1047009C0126 /* PartitionedConvolution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B85C0F43603A0044CAC0 /* PartitionedConvolution.cpp */; }; 7742A4B60FEA960D00AE1A03 /* GendynUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8470F43603A0044CAC0 /* GendynUGens.cpp */; }; 7742A4CE0FEA972500AE1A03 /* GendynUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8470F43603A0044CAC0 /* GendynUGens.cpp */; }; + 77476E9712FDE60E007449B3 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77476E9612FDE60E007449B3 /* Accelerate.framework */; }; + 77476E9D12FDE61C007449B3 /* FFT_UGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8430F43603A0044CAC0 /* FFT_UGens.cpp */; }; + 77476EA012FDE633007449B3 /* FFTInterfaceTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8450F43603A0044CAC0 /* FFTInterfaceTable.cpp */; }; + 77476EA412FDE651007449B3 /* PartitionedConvolution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B85C0F43603A0044CAC0 /* PartitionedConvolution.cpp */; }; + 77476EA512FDE652007449B3 /* PV_UGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B85F0F43603A0044CAC0 /* PV_UGens.cpp */; }; + 77476EBA12FDE672007449B3 /* scUBlibsndfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 77476E9312FDE5FB007449B3 /* scUBlibsndfile.a */; }; 7751B8680F4363C40044CAC0 /* BinaryOpUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8390F43603A0044CAC0 /* BinaryOpUGens.cpp */; }; 7751B87C0F4368070044CAC0 /* ChaosUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B83A0F43603A0044CAC0 /* ChaosUGens.cpp */; }; 7751B87E0F4368090044CAC0 /* DelayUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B83D0F43603A0044CAC0 /* DelayUGens.cpp */; }; @@ -39,7 +45,8 @@ 7751B8910F4368AE0044CAC0 /* TriggerUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8640F43603A0044CAC0 /* TriggerUGens.cpp */; }; 7751B8920F4368B00044CAC0 /* UnaryOpUGens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7751B8650F43603A0044CAC0 /* UnaryOpUGens.cpp */; }; 775384800FBDE6EA00DADEB2 /* iPhoneUGens.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7751B84A0F43603A0044CAC0 /* iPhoneUGens.mm */; }; - 77597BA6112336DD00D2A968 /* libsndfile_iphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 778F126B0F50A87300CB6629 /* libsndfile_iphone.a */; }; + 7759953912FDE0C900603187 /* SC_fftlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7759953812FDE0C900603187 /* SC_fftlib.cpp */; }; + 775995B712FDE5BB00603187 /* SC_fftlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7759953812FDE0C900603187 /* SC_fftlib.cpp */; }; 775D93DA0F509D2F00112D87 /* SC_AllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777249810EABE96E00732A1C /* SC_AllocPool.cpp */; }; 775D93DB0F509D2F00112D87 /* SC_DirUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777249820EABE96E00732A1C /* SC_DirUtils.cpp */; }; 775D93DC0F509D2F00112D87 /* SC_Sem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777249840EABE96E00732A1C /* SC_Sem.cpp */; }; @@ -224,6 +231,8 @@ 772C0C1E12DA0A03009C0126 /* SC_UnitDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SC_UnitDef.h; sourceTree = ""; }; 772C0C1F12DA0A03009C0126 /* SC_UnitSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SC_UnitSpec.h; sourceTree = ""; }; 772C0C2012DA0A03009C0126 /* SC_WireSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SC_WireSpec.h; sourceTree = ""; }; + 77476E9312FDE5FB007449B3 /* scUBlibsndfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = scUBlibsndfile.a; path = ../mac/lib/scUBlibsndfile.a; sourceTree = SOURCE_ROOT; }; + 77476E9612FDE60E007449B3 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; 7751B8350F43603A0044CAC0 /* BeatTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BeatTrack.cpp; sourceTree = ""; }; 7751B8360F43603A0044CAC0 /* BeatTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeatTrack.h; sourceTree = ""; }; 7751B8370F43603A0044CAC0 /* BeatTrack2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BeatTrack2.cpp; sourceTree = ""; }; @@ -296,7 +305,9 @@ 7752330F12F5926C005AE5FE /* vec_sse.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec_sse.hpp; sourceTree = ""; }; 7752331012F5926C005AE5FE /* vec_sse2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec_sse2.hpp; sourceTree = ""; }; 7752331112F5926C005AE5FE /* wrap_arguments.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = wrap_arguments.hpp; sourceTree = ""; }; - 7755359A111C959D00534FFB /* scUBlibsndfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = scUBlibsndfile.a; path = ../mac/lib/scUBlibsndfile.a; sourceTree = ""; }; + 7759953812FDE0C900603187 /* SC_fftlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SC_fftlib.cpp; sourceTree = ""; }; + 775995A512FDE51C00603187 /* SuperCollider_BrowserPage.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SuperCollider_BrowserPage.xib; path = "iPhone Resources/SuperCollider_BrowserPage.xib"; sourceTree = ""; }; + 775995B312FDE5B000603187 /* libsndfile_iphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsndfile_iphone.a; path = lib/libsndfile_iphone.a; sourceTree = ""; }; 7772497F0EABE96E00732A1C /* fftlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fftlib.c; sourceTree = ""; }; 777249810EABE96E00732A1C /* SC_AllocPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SC_AllocPool.cpp; sourceTree = ""; }; 777249820EABE96E00732A1C /* SC_DirUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SC_DirUtils.cpp; sourceTree = ""; }; @@ -333,9 +344,12 @@ 778F12440F50A70400CB6629 /* iscsynth.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = iscsynth.plist; path = "iPhone Resources/iscsynth.plist"; sourceTree = ""; }; 778F12450F50A70400CB6629 /* iscsynth_MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = iscsynth_MainWindow.xib; path = "iPhone Resources/iscsynth_MainWindow.xib"; sourceTree = ""; }; 778F12510F50A72900CB6629 /* synthdefs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = synthdefs; path = "iPhone Resources/synthdefs"; sourceTree = ""; }; - 778F126B0F50A87300CB6629 /* libsndfile_iphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsndfile_iphone.a; path = lib/libsndfile_iphone.a; sourceTree = ""; }; 77A489370FBFA8DA00E909E1 /* SuperCollider_FileTransfer.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SuperCollider_FileTransfer.xib; path = "iPhone Resources/SuperCollider_FileTransfer.xib"; sourceTree = ""; }; 77AA93920EB3685400DC0BCB /* libscsynth.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libscsynth.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 77AB4FC112FB38AC00810BCF /* vec_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec_base.hpp; sourceTree = ""; }; + 77AB4FC212FB38AC00810BCF /* vec_int_altivec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec_int_altivec.hpp; sourceTree = ""; }; + 77AB4FC312FB38AC00810BCF /* vec_int_neon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec_int_neon.hpp; sourceTree = ""; }; + 77AB4FC412FB38AC00810BCF /* vec_neon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vec_neon.hpp; sourceTree = ""; }; 77BA5025129C364A00CE89DD /* FileBrowserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileBrowserViewController.h; sourceTree = ""; }; 77BA5026129C364A00CE89DD /* FileBrowserViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileBrowserViewController.mm; sourceTree = ""; }; /* End PBXFileReference section */ @@ -350,7 +364,8 @@ 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, 77724C6B0EABF92400732A1C /* AudioToolbox.framework in Frameworks */, 77724C6D0EABF92400732A1C /* CoreAudio.framework in Frameworks */, - 77597BA6112336DD00D2A968 /* libsndfile_iphone.a in Frameworks */, + 77476E9712FDE60E007449B3 /* Accelerate.framework in Frameworks */, + 77476EBA12FDE672007449B3 /* scUBlibsndfile.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -396,6 +411,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 775995A512FDE51C00603187 /* SuperCollider_BrowserPage.xib */, 778F12440F50A70400CB6629 /* iscsynth.plist */, 778F12450F50A70400CB6629 /* iscsynth_MainWindow.xib */, 77A489370FBFA8DA00E909E1 /* SuperCollider_FileTransfer.xib */, @@ -407,13 +423,14 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 778F126B0F50A87300CB6629 /* libsndfile_iphone.a */, - 7755359A111C959D00534FFB /* scUBlibsndfile.a */, + 77476E9612FDE60E007449B3 /* Accelerate.framework */, 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, 1D30AB110D05D00D00671497 /* Foundation.framework */, 288765FC0DF74451002DB57D /* CoreGraphics.framework */, 77724C6A0EABF92400732A1C /* AudioToolbox.framework */, 77724C6C0EABF92400732A1C /* CoreAudio.framework */, + 77476E9312FDE5FB007449B3 /* scUBlibsndfile.a */, + 775995B312FDE5B000603187 /* libsndfile_iphone.a */, ); name = Frameworks; sourceTree = ""; @@ -512,9 +529,13 @@ 7752330912F5926C005AE5FE /* vec.hpp */, 7752330A12F5926C005AE5FE /* vec_avx_double.hpp */, 7752330B12F5926C005AE5FE /* vec_avx_float.hpp */, + 77AB4FC112FB38AC00810BCF /* vec_base.hpp */, 7752330C12F5926C005AE5FE /* vec_generic.hpp */, + 77AB4FC212FB38AC00810BCF /* vec_int_altivec.hpp */, 7752330D12F5926C005AE5FE /* vec_int_avx.hpp */, + 77AB4FC312FB38AC00810BCF /* vec_int_neon.hpp */, 7752330E12F5926C005AE5FE /* vec_int_sse2.hpp */, + 77AB4FC412FB38AC00810BCF /* vec_neon.hpp */, 7752330F12F5926C005AE5FE /* vec_sse.hpp */, 7752331012F5926C005AE5FE /* vec_sse2.hpp */, 7752331112F5926C005AE5FE /* wrap_arguments.hpp */, @@ -537,6 +558,7 @@ 7772497D0EABE96E00732A1C /* common */ = { isa = PBXGroup; children = ( + 7759953812FDE0C900603187 /* SC_fftlib.cpp */, 778F12660F50A85200CB6629 /* iPhone */, 7772497F0EABE96E00732A1C /* fftlib.c */, 777249810EABE96E00732A1C /* SC_AllocPool.cpp */, @@ -840,6 +862,11 @@ 770903C80F50A468005C05DC /* iscsynthmain.m in Sources */, 7742A4B60FEA960D00AE1A03 /* GendynUGens.cpp in Sources */, 77BA5027129C364A00CE89DD /* FileBrowserViewController.mm in Sources */, + 775995B712FDE5BB00603187 /* SC_fftlib.cpp in Sources */, + 77476E9D12FDE61C007449B3 /* FFT_UGens.cpp in Sources */, + 77476EA012FDE633007449B3 /* FFTInterfaceTable.cpp in Sources */, + 77476EA412FDE651007449B3 /* PartitionedConvolution.cpp in Sources */, + 77476EA512FDE652007449B3 /* PV_UGens.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -900,6 +927,7 @@ 772C0ECA12DA0FC0009C0126 /* PV_UGens.cpp in Sources */, 772C0F0212DA1043009C0126 /* FFTInterfaceTable.cpp in Sources */, 772C0F0312DA1047009C0126 /* PartitionedConvolution.cpp in Sources */, + 7759953912FDE0C900603187 /* SC_fftlib.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -918,16 +946,15 @@ GCC_PREPROCESSOR_DEFINITIONS = ( SC_IPHONE, STATIC_PLUGINS, + NOVA_SIMD, ); GCC_THUMB_SUPPORT = NO; - HEADER_SEARCH_PATHS = ../common/include/libsndfile; INFOPLIST_FILE = "iPhone Resources/iscsynth.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 3.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.2; LIBRARY_SEARCH_PATHS = ( - lib, - ../mac/lib, - "\"$(SYSTEM_APPS_DIR)/SC3/source/mac/lib\"", - "\"$(SYSTEM_APPS_DIR)/SC3/source/iphone/lib\"", + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/SC3/git/platform/iphone/lib\"", + "\"$(SYSTEM_APPS_DIR)/SC3/git/platform/mac/lib\"", ); PRODUCT_NAME = iscsynth; SYMROOT = build_iphone; @@ -944,16 +971,16 @@ GCC_PREPROCESSOR_DEFINITIONS = ( SC_IPHONE, STATIC_PLUGINS, + NDEBUG, + NOVA_SIMD, ); GCC_THUMB_SUPPORT = NO; - HEADER_SEARCH_PATHS = ../common/include/libsndfile; INFOPLIST_FILE = "iPhone Resources/iscsynth.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 3.0; + IPHONEOS_DEPLOYMENT_TARGET = 3.2; LIBRARY_SEARCH_PATHS = ( - lib, - ../mac/lib, - "\"$(SYSTEM_APPS_DIR)/SC3/source/mac/lib\"", - "\"$(SYSTEM_APPS_DIR)/SC3/source/iphone/lib\"", + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/SC3/git/platform/iphone/lib\"", + "\"$(SYSTEM_APPS_DIR)/SC3/git/platform/mac/lib\"", ); PRODUCT_NAME = iscsynth; SYMROOT = build_iphone; @@ -979,6 +1006,10 @@ GCC_VERSION = 4.2; GENERATE_MASTER_OBJECT_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.0; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/SC3/git/platform/mac/lib\"", + ); PREBINDING = NO; PRODUCT_NAME = libscsynth; SKIP_INSTALL = NO; @@ -1007,6 +1038,10 @@ GCC_VERSION = 4.2; GENERATE_MASTER_OBJECT_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.0; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/SC3/git/platform/mac/lib\"", + ); OBJROOT = "$(SYMROOT)"; PREBINDING = NO; PRODUCT_NAME = libscsynth; diff --git a/server/scsynth/iPhone/iSCSynthController.h b/server/scsynth/iPhone/iSCSynthController.h index b2df2d24f8..8df172276a 100644 --- a/server/scsynth/iPhone/iSCSynthController.h +++ b/server/scsynth/iPhone/iSCSynthController.h @@ -7,7 +7,7 @@ // #import -#import "DirBrowserView.h" +#import "FileBrowserViewController.h" #include "SC_World.h" #include "SC_HiddenWorld.h" @@ -31,7 +31,7 @@ IBOutlet UITextView *logView; IBOutlet UIViewController *logViewController; - IBOutlet DirBrowserViewController *synthdefsViewController; + IBOutlet FileBrowserViewController *synthdefsViewController; }