From 7cb9bb7a258980a9a88ab00de947f4bc7bde64ca Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Tue, 25 Dec 2012 20:42:29 +0000
Subject: LINKFLAGS, not LINKFAGS


diff --git a/SConscript b/SConscript
index f235832..a8ad093 100644
--- a/SConscript
+++ b/SConscript
@@ -156,7 +156,7 @@ if(GetOption('lin')):
 	env.Append(LIBS=['X11', 'rt'])
 	env.Append(CPPDEFINES=["LIN"])
 	if GetOption('_64bit'):
-		env.Append(LINKFAGS=['-m64'])
+		env.Append(LINKFLAGS=['-m64'])
 		env.Append(CCFLAGS=['-m64'])
 	else:
 		env.Append(LINKFLAGS=['-m32'])
@@ -176,7 +176,7 @@ if(GetOption('macosx')):
 	#env.Append(LINKFLAGS=['-framework Lua'])
 	#env.Append(LINKFLAGS=['-framework Cocoa'])
 	if GetOption('_64bit'):
-		env.Append(LINKFAGS=['-m64'])
+		env.Append(LINKFLAGS=['-m64'])
 		env.Append(CCFLAGS=['-m64'])
 	else:
 		env.Append(LINKFLAGS=['-m32'])
--
cgit v0.9.2-21-gd62e

From 110fa71a2ce2c35352fe9ebad4727d7a1fac23a7 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Tue, 25 Dec 2012 20:11:48 -0500
Subject: Comment out cpu_check, which only creates errors


diff --git a/src/Misc.cpp b/src/Misc.cpp
index 21e5cac..978b05b 100644
--- a/src/Misc.cpp
+++ b/src/Misc.cpp
@@ -279,7 +279,7 @@ void *file_load(char *fn, int *size)
 
 int cpu_check(void)
 {
-#ifdef MACOSX
+/*#ifdef MACOSX
 	return 0;
 #else
 #ifdef X86
@@ -301,7 +301,7 @@ int cpu_check(void)
 		return 1;
 #endif
 #endif
-#endif
+#endif*/
 	return 0;
 }
 
--
cgit v0.9.2-21-gd62e