fix compiling problems

The-Powder-Toy · Jul 6, 2014 · 8f2a0d3 · 8f2a0d3
1 parent 89eb6bb
commit 8f2a0d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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();