From eba585829684fcf54a0c8614709d2c10c75032b4 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Sat, 8 Jan 2005 04:59:44 +0000
Subject: merge in branch "20041229-unify" - some small cleanups os x fixes
 minor updates improved buffer handling simplify updates Mac adaptations -
 made xcode project preparing xsample 0.3.0 release updated for build system
 some optimizations - fixed loop record bug Completion of attribute
 functionality, revisited and updated help files

svn path=/trunk/; revision=2477
---
 .../grill/xsample/xsample.xcode/project.pbxproj    | 92 ++++++++++++++--------
 1 file changed, 58 insertions(+), 34 deletions(-)

(limited to 'externals/grill/xsample/xsample.xcode/project.pbxproj')

diff --git a/externals/grill/xsample/xsample.xcode/project.pbxproj b/externals/grill/xsample/xsample.xcode/project.pbxproj
index c9df035c..5027e5a0 100644
--- a/externals/grill/xsample/xsample.xcode/project.pbxproj
+++ b/externals/grill/xsample/xsample.xcode/project.pbxproj
@@ -56,8 +56,9 @@
 		};
 		0867D69AFE84028FC02AAC07 = {
 			children = (
-				E9974E060770761500206F68,
-				E9974E04077075E800206F68,
+				E98C3076078D948800EC0264,
+				E94AC9630789EEA300AE1770,
+				E94AC9610789EE8700AE1770,
 				E9974DFA0770750400206F68,
 				E9974DFB0770750400206F68,
 			);
@@ -105,6 +106,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = source/prefix.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS) _DEBUG FLEXT_USESIMD";
 				OPTIMIZATION_CFLAGS = "-O0";
 				ZERO_LINK = YES;
 			};
@@ -118,6 +120,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = source/prefix.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS) NDEBUG  FLEXT_USESIMD";
 				ZERO_LINK = NO;
 			};
 			isa = PBXBuildStyle;
@@ -158,7 +161,8 @@
 		D2AAC09B05546B4700DB518D = {
 			buildActionMask = 2147483647;
 			files = (
-				E9974E05077075E800206F68,
+				E94AC9640789EEA300AE1770,
+				E98C3077078D948800EC0264,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -210,6 +214,54 @@
 //E92
 //E93
 //E94
+		E94AC9610789EE8700AE1770 = {
+			isa = PBXFileReference;
+			lastKnownFileType = archive.ar;
+			name = "libflext-max_sd.a";
+			path = "/usr/local/lib/libflext-max_sd.a";
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		E94AC9620789EE8700AE1770 = {
+			fileRef = E94AC9610789EE8700AE1770;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E94AC9630789EEA300AE1770 = {
+			isa = PBXFileReference;
+			lastKnownFileType = archive.ar;
+			name = "libflext-pd_sd.a";
+			path = "/usr/local/lib/libflext-pd_sd.a";
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		E94AC9640789EEA300AE1770 = {
+			fileRef = E94AC9630789EEA300AE1770;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E98C3076078D948800EC0264 = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
+			name = vecLib.framework;
+			path = /System/Library/Frameworks/vecLib.framework;
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		E98C3077078D948800EC0264 = {
+			fileRef = E98C3076078D948800EC0264;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		E98C3078078D948800EC0264 = {
+			fileRef = E98C3076078D948800EC0264;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		E9974DE50770749400206F68 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -331,28 +383,6 @@
 			refType = 0;
 			sourceTree = "<absolute>";
 		};
-		E9974E04077075E800206F68 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = libflext_s.a;
-			path = /Volumes/Daten/Prog/pdmax/flext/build/libflext_s.a;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		E9974E05077075E800206F68 = {
-			fileRef = E9974E04077075E800206F68;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		E9974E060770761500206F68 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = "libflext-max_s.a";
-			path = "/Volumes/Daten/Prog/pdmax/flext/build/libflext-max_s.a";
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
 		E9974E2B07707D1400206F68 = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -397,7 +427,8 @@
 			files = (
 				E9974E5C0770851700206F68,
 				E9974E5B0770851500206F68,
-				E9974E5A0770851200206F68,
+				E94AC9620789EE8700AE1770,
+				E98C3078078D948800EC0264,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -415,10 +446,9 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=1";
 				HEADER_SEARCH_PATHS = "$(Max SDK)/max-includes $(Max SDK)/msp-includes $(Flext)/source";
 				INFOPLIST_FILE = "source/xsample-Info.plist";
-				INSTALL_PATH = "\"/Library/Application Support/Cycling '74/externals\"";
+				INSTALL_PATH = "/Library/Application Support/Cycling 74/externals";
 				LIBRARY_SEARCH_PATHS = "$(Flext)/build";
 				LIBRARY_STYLE = DYNAMIC;
-				OPTIMIZATION_CFLAGS = "";
 				OTHER_CFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = xsample;
@@ -480,12 +510,6 @@
 			settings = {
 			};
 		};
-		E9974E5A0770851200206F68 = {
-			fileRef = E9974E060770761500206F68;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		E9974E5B0770851500206F68 = {
 			fileRef = E9974DFA0770750400206F68;
 			isa = PBXBuildFile;
-- 
cgit v1.2.1