Fix build problems under OS X

git-svn-id: svn://svn.icculus.org/quake3/trunk@154 edf5b092-35ff-0310-97b2-ce42778d08ea

5 files changed, 5 insertions, 156 deletions

diff --git a/code/client/snd_mix.c b/code/client/snd_mix.c
index a363c6a..36bb182 100644
--- a/code/client/snd_mix.c
+++ b/code/client/snd_mix.c
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // snd_mix.c -- portable code to mix sounds for snd_dma.c
 
 #include "snd_local.h"
-#if idppc_altivec
+#if idppc_altivec && !defined(MACOS_X)
 #include <altivec.h>
 #endif
 
diff --git a/code/macosx/Quake3.pbproj/project.pbxproj b/code/macosx/Quake3.pbproj/project.pbxproj
index baf71bd..01f5747 100644
--- a/code/macosx/Quake3.pbproj/project.pbxproj
+++ b/code/macosx/Quake3.pbproj/project.pbxproj
@@ -3049,140 +3049,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		012ADAA400868211C697A10E = {
-			children = (
-				012ADAA500868211C697A10E,
-				012ADAA600868211C697A10E,
-				012ADAA700868211C697A10E,
-				012ADAA800868211C697A10E,
-				012ADAA900868211C697A10E,
-				012ADAAA00868211C697A10E,
-				012ADAAB00868211C697A10E,
-				012ADAAC00868211C697A10E,
-				012ADAAD00868211C697A10E,
-				012ADAAE00868211C697A10E,
-				012ADAAF00868211C697A10E,
-				012ADAB000868211C697A10E,
-				012ADAB100868211C697A10E,
-				012ADAB200868211C697A10E,
-			);
-			isa = PBXGroup;
-			path = mac;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAA500868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_console.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAA600868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_event.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAA700868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_glimp2.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAA800868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_input.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAA900868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = mac_local.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAAA00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_main.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAAB00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_net.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAAC00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = mac_snddma.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAAD00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = MacGamma.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAAE00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = MacGamma.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAAF00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = macprefix.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAB000868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.rez;
-			path = q3.r;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAB100868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = SetupGL.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		012ADAB200868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SetupGL.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		012ADAB300868211C697A10E = {
 			children = (
 				012ADAB400868211C697A10E,
@@ -4453,7 +4319,6 @@
 				012ADB4800868211C697A10E,
 				012ADB4900868211C697A10E,
 				012ADB4A00868211C697A10E,
-				012ADB4B00868211C697A10E,
 			);
 			isa = PBXGroup;
 			path = ui;
@@ -4540,14 +4405,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		012ADB4B00868211C697A10E = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = ui_util.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		012ADB4C00868211C697A10E = {
 			children = (
 				012ADB4D00868211C697A10E,
@@ -4995,7 +4852,6 @@
 		016EAE0A00B4BDD1C697A10E = {
 			buildActionMask = 2147483647;
 			files = (
-				016EAE0B00B4BDD1C697A10E,
 				016EAE0C00B4BDD1C697A10E,
 				016EAE0D00B4BDD1C697A10E,
 				016EAE0E00B4BDD1C697A10E,
@@ -5010,12 +4866,6 @@
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		016EAE0B00B4BDD1C697A10E = {
-			fileRef = 012ADB4B00868211C697A10E;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		016EAE0C00B4BDD1C697A10E = {
 			fileRef = 012ADB4A00868211C697A10E;
 			isa = PBXBuildFile;
@@ -8216,7 +8066,6 @@
 				012AD9A500868211C697A10E,
 				012ADA2400868211C697A10E,
 				012ADA6500868211C697A10E,
-				012ADAA400868211C697A10E,
 				012ADAB300868211C697A10E,
 				012ADABB00868211C697A10E,
 				012ADAEC00868211C697A10E,
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index d2b164b..03b20eb 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // tr_shade.c
 
-#include "tr_local.h"
-#if idppc_altivec
+#include "tr_local.h" 
+#if idppc_altivec && !defined(MACOS_X)
 #include <altivec.h>
 #endif
 
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index ae33c51..2c535a9 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // tr_shade_calc.c
 
 #include "tr_local.h"
-#if idppc_altivec
+#if idppc_altivec && !defined(MACOS_X)
 #include <altivec.h>
 #endif
 
diff --git a/code/renderer/tr_surface.c b/code/renderer/tr_surface.c
index 7b5e764..183ef7f 100644
--- a/code/renderer/tr_surface.c
+++ b/code/renderer/tr_surface.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // tr_surf.c
 #include "tr_local.h"
-#if idppc_altivec
+#if idppc_altivec && !defined(MACOS_X)
 #include <altivec.h>
 #endif