From 8f2a0d3eb3b4cc1d014d5b7a01b5b7ebf70956ef Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sun, 6 Jul 2014 11:31:40 -0400
Subject: [PATCH] fix compiling problems

---
 SConscript                 | 2 +-
 src/simulation/Gravity.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/SConscript b/SConscript
index b08b5068a7..ee408136b2 100644
--- a/SConscript
+++ b/SConscript
@@ -339,7 +339,7 @@ elif not GetOption('help'):
 	conf.AddTest('CheckBit', CheckBit)
 	if not conf.CheckCC() or not conf.CheckCXX():
 		FatalError("compiler not correctly configured")
-	if isX86 and not GetOption('32bit') and not GetOption('64bit'):
+	if platform == compilePlatform and isX86 and not GetOption('32bit') and not GetOption('64bit'):
 		conf.CheckBit()
 	findLibs(env, conf)
 	env = conf.Finish()
diff --git a/src/simulation/Gravity.cpp b/src/simulation/Gravity.cpp
index 3cced661eb..ff234a1883 100755
--- a/src/simulation/Gravity.cpp
+++ b/src/simulation/Gravity.cpp
@@ -144,7 +144,10 @@ void Gravity::update_grav_async()
 	//memset(th_gravy, 0, XRES*YRES*sizeof(float));
 	//memset(th_gravx, 0, XRES*YRES*sizeof(float));
 	//memset(th_gravp, 0, XRES*YRES*sizeof(float));
-	if (!grav_fft_status) grav_fft_init();
+#ifdef GRAVFFT
+	if (!grav_fft_status)
+		grav_fft_init();
+#endif
 	while(!thread_done){
 		if(!done){
 			update_grav();