From: <fea...@li...> - 2006-03-08 14:00:15
|
Revision: 56 Author: KoenTanghe Date: 2006-03-08 05:59:10 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/feapi/?rev=56&view=rev Log Message: ----------- Merge of Experimental branch into trunk. Had to do some manual work, as SVN gave some very strange error messages.... Latest revision before this merge/commit was 55. Modified Paths: -------------- trunk/FEAPI/build/Mac/ExamplePluginFindMax/ExamplePluginFindMax.xcodeproj/project.pbxproj trunk/FEAPI/build/Mac/FEAPIHost_C/FEAPIHost_C.xcodeproj/project.pbxproj trunk/FEAPI/build/Win/FEAPI.dsw trunk/FEAPI/build/Win/FEAPI.sln trunk/FEAPI/build/Win/FEAPIHost_C/FEAPITestCL.dsp trunk/FEAPI/build/Win/FEAPIHost_C/FEAPITestCL.vcproj trunk/FEAPI/examples/plugin/FEAPIExamplePluginFindMax/FEAPIExamplePluginFindMax.cpp trunk/FEAPI/examples/plugin/FEAPIExamplePluginFindMax/FEAPIExamplePluginFindMax.h trunk/FEAPI/include/FEAPI.h trunk/FEAPI/sdk/plugin/include/FEAPIPluginBase.h trunk/FEAPI/sdk/plugin/src/FEAPIPluginBase.cpp Added Paths: ----------- trunk/FEAPI/build/Mac/ExamplePluginFindRms/ trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/ trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/InfoPlist.strings trunk/FEAPI/build/Mac/ExamplePluginFindRms/ExamplePluginFindRms.xcodeproj/ trunk/FEAPI/build/Mac/ExamplePluginFindRms/ExamplePluginFindRms.xcodeproj/project.pbxproj trunk/FEAPI/build/Mac/ExamplePluginFindRms/Info.plist trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/ trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/English.lproj/ trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/English.lproj/InfoPlist.strings trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/Info.plist trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/feapi~.xcodeproj/ trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/feapi~.xcodeproj/project.pbxproj trunk/FEAPI/build/Win/ExamplePluginFindMax/ trunk/FEAPI/build/Win/ExamplePluginFindMax/ExamplePluginFindMax.def trunk/FEAPI/build/Win/ExamplePluginFindMax/ExamplePluginFindMax.dsp trunk/FEAPI/build/Win/ExamplePluginFindMax/ExamplePluginFindMax.vcproj trunk/FEAPI/build/Win/ExamplePluginFindRms/ trunk/FEAPI/build/Win/ExamplePluginFindRms/ExamplePluginFindRms.dsp trunk/FEAPI/build/Win/ExamplePluginFindRms/ExamplePluginFindRms.vcproj trunk/FEAPI/build/Win/ExamplePluginFindRms/FEAPIExamplePluginFindRms.def trunk/FEAPI/build/Win/FEAPI_MaxMSP_Host/ trunk/FEAPI/build/Win/FEAPI_MaxMSP_Host/feapi.def trunk/FEAPI/build/Win/FEAPI_MaxMSP_Host/feapi.vcproj trunk/FEAPI/sdk/host/include/FEAPIHostDeclarations.h trunk/FEAPI/sdk/host/include/FEAPIHostUtils.h trunk/FEAPI/sdk/host/include/FEAPIPluginProxy.h trunk/FEAPI/sdk/host/src/FEAPIHostUtils.cpp trunk/FEAPI/sdk/host/src/FEAPIPluginProxy.cpp trunk/FEAPI/sdk/plugin/include/FEAPIEntryPoints.h Removed Paths: ------------- trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/ trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/InfoPlist.strings trunk/FEAPI/build/Mac/ExamplePluginFindRms/ExamplePluginFindRms.xcodeproj/ trunk/FEAPI/build/Mac/ExamplePluginFindRms/ExamplePluginFindRms.xcodeproj/project.pbxproj trunk/FEAPI/build/Mac/ExamplePluginFindRms/Info.plist trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/English.lproj/ trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/English.lproj/InfoPlist.strings trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/Info.plist trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/feapi~.xcodeproj/ trunk/FEAPI/build/Mac/FEAPI_MaxMSP_Host/feapi~.xcodeproj/project.pbxproj trunk/FEAPI/build/Win/ExamplePluginFindMax/ExamplePluginFindMax.def trunk/FEAPI/build/Win/ExamplePluginFindMax/ExamplePluginFindMax.dsp trunk/FEAPI/build/Win/ExamplePluginFindMax/ExamplePluginFindMax.vcproj trunk/FEAPI/build/Win/ExamplePluginFindRms/ExamplePluginFindRms.dsp trunk/FEAPI/build/Win/ExamplePluginFindRms/ExamplePluginFindRms.vcproj trunk/FEAPI/build/Win/ExamplePluginFindRms/FEAPIExamplePluginFindRms.def trunk/FEAPI/build/Win/FEAPI_MaxMSP_Host/feapi.def trunk/FEAPI/build/Win/FEAPI_MaxMSP_Host/feapi.vcproj trunk/FEAPI/sdk/plugin/src/FEAPI.cpp trunk/FEAPI/sdk/plugin/src/FEAPI.def Modified: trunk/FEAPI/build/Mac/ExamplePluginFindMax/ExamplePluginFindMax.xcodeproj/project.pbxproj =================================================================== --- trunk/FEAPI/build/Mac/ExamplePluginFindMax/ExamplePluginFindMax.xcodeproj/project.pbxproj 2006-03-08 12:19:47 UTC (rev 55) +++ trunk/FEAPI/build/Mac/ExamplePluginFindMax/ExamplePluginFindMax.xcodeproj/project.pbxproj 2006-03-08 13:59:10 UTC (rev 56) @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 45F43028097D371900FAC600 /* FEAPIExamplePluginFindMax.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F43027097D371900FAC600 /* FEAPIExamplePluginFindMax.cpp */; }; - 45F4302D097D375300FAC600 /* FEAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F4302B097D375300FAC600 /* FEAPI.cpp */; }; 45F4302E097D375300FAC600 /* FEAPIPluginBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F4302C097D375300FAC600 /* FEAPIPluginBase.cpp */; }; 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; }; 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; }; @@ -32,12 +31,12 @@ /* Begin PBXFileReference section */ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; - 45F43026097D371900FAC600 /* FEAPIExamplePluginFindMax.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPIExamplePluginFindMax.h; path = ../../../src/FEAPIExamplePluginFindMax/FEAPIExamplePluginFindMax.h; sourceTree = SOURCE_ROOT; }; - 45F43027097D371900FAC600 /* FEAPIExamplePluginFindMax.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FEAPIExamplePluginFindMax.cpp; path = ../../../src/FEAPIExamplePluginFindMax/FEAPIExamplePluginFindMax.cpp; sourceTree = SOURCE_ROOT; }; - 45F4302A097D373900FAC600 /* FEAPIPluginBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPIPluginBase.h; path = ../../../src/incl/FEAPIPluginBase.h; sourceTree = SOURCE_ROOT; }; - 45F4302B097D375300FAC600 /* FEAPI.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FEAPI.cpp; path = ../../../src/FEAPI/FEAPI.cpp; sourceTree = SOURCE_ROOT; }; - 45F4302C097D375300FAC600 /* FEAPIPluginBase.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FEAPIPluginBase.cpp; path = ../../../src/FEAPI/FEAPIPluginBase.cpp; sourceTree = SOURCE_ROOT; }; - 45F4302F097D376900FAC600 /* FEAPI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPI.h; path = ../../../incl/FEAPI.h; sourceTree = SOURCE_ROOT; }; + 45F43026097D371900FAC600 /* FEAPIExamplePluginFindMax.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPIExamplePluginFindMax.h; path = ../../../examples/FEAPIExamplePluginFindMax/FEAPIExamplePluginFindMax.h; sourceTree = SOURCE_ROOT; }; + 45F43027097D371900FAC600 /* FEAPIExamplePluginFindMax.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FEAPIExamplePluginFindMax.cpp; path = ../../../examples/FEAPIExamplePluginFindMax/FEAPIExamplePluginFindMax.cpp; sourceTree = SOURCE_ROOT; }; + 45F4302A097D373900FAC600 /* FEAPIPluginBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPIPluginBase.h; path = ../../../sdk/include/FEAPIPluginBase.h; sourceTree = SOURCE_ROOT; }; + 45F4302C097D375300FAC600 /* FEAPIPluginBase.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FEAPIPluginBase.cpp; path = ../../../sdk/src/FEAPIPluginBase.cpp; sourceTree = SOURCE_ROOT; }; + 45F4302F097D376900FAC600 /* FEAPI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPI.h; path = ../../../include/FEAPI.h; sourceTree = SOURCE_ROOT; }; + 45F4330E097FDECF00FAC600 /* FEAPIEntryPoints.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FEAPIEntryPoints.h; path = ../../../sdk/include/FEAPIEntryPoints.h; sourceTree = SOURCE_ROOT; }; 8D576316048677EA00EA77CD /* FindAbsoluteMax.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FindAbsoluteMax.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -85,8 +84,8 @@ 08FB77AFFE84173DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( + 45F4330E097FDECF00FAC600 /* FEAPIEntryPoints.h */, 45F4302F097D376900FAC600 /* FEAPI.h */, - 45F4302B097D375300FAC600 /* FEAPI.cpp */, 45F4302C097D375300FAC600 /* FEAPIPluginBase.cpp */, 45F4302A097D373900FAC600 /* FEAPIPluginBase.h */, 45F43026097D371900FAC600 /* FEAPIExamplePluginFindMax.h */, @@ -181,7 +180,6 @@ buildActionMask = 2147483647; files = ( 45F43028097D371900FAC600 /* FEAPIExamplePluginFindMax.cpp in Sources */, - 45F4302D097D375300FAC600 /* FEAPI.cpp in Sources */, 45F4302E097D375300FAC600 /* FEAPIPluginBase.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -210,10 +208,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GENERATE_PKGINFO_FILE = NO; HEADER_SEARCH_PATHS = ( - ../../incl/, + ../../include/, "$(HEADER_SEARCH_PATHS)", - ../../src/incl, - ../../src/FEAPIExamplePluginFindMax, + ../../sdk/include, + ../../examples/FEAPIExamplePluginFindMax, ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/FEAPI"; @@ -234,10 +232,10 @@ GCC_MODEL_TUNING = G5; GENERATE_PKGINFO_FILE = NO; HEADER_SEARCH_PATHS = ( - ../../incl/, + ../../include/, "$(HEADER_SEARCH_PATHS)", - ../../src/incl, - ../../src/FEAPIExamplePluginFindMax, + ../../sdk/include, + ../../examples/FEAPIExamplePluginFindMax, ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/FEAPI"; Copied: trunk/FEAPI/build/Mac/ExamplePluginFindRms (from rev 55, branches/Experimental/FEAPI/build/Mac/ExamplePluginFindRms) Copied: trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj (from rev 55, branches/Experimental/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj) Deleted: trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/InfoPlist.strings =================================================================== --- branches/Experimental/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/InfoPlist.strings 2006-03-08 12:19:47 UTC (rev 55) +++ trunk/FEAPI/build/Mac/ExamplePluginFindRms/English.lproj/InfoPlist.strings 2006-03-08 13:59:10 UTC (rev 56) @@ -1,3 +0,0 @@ -\xFE\xFF |