From: Josh Lee <jleedev@gmail.com>
Date: Tue, 29 May 2018 12:09:01 +0000 (-0400)
Subject: Enable 64-bit osx build and fix a warning.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=32f96080ad2f1bf263e101c245f0332eed021d5a;p=sgt-puzzles.git

Enable 64-bit osx build and fix a warning.

OS X is beginning to show a warning when a 32-bit application is
opened, so it's high time that this gets enabled. Fix a clang warning
exposed by this build.
---

diff --git a/.gitignore b/.gitignore
index bc2d8cc..05dceb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,8 +97,10 @@
 /org
 /*.ppc
 /*.i386
+/*.x86_64
 /Puzzles.ppc.bin
 /Puzzles.i386.bin
+/Puzzles.x86_64.bin
 /version2.def
 /preprocessed.but
 /*.a
diff --git a/keen.c b/keen.c
index be77b18..423ec8c 100644
--- a/keen.c
+++ b/keen.c
@@ -1101,7 +1101,7 @@ done
 		    cluevals[j] *= grid[i];
 		    break;
 		  case C_SUB:
-		    cluevals[j] = abs(cluevals[j] - grid[i]);
+		    cluevals[j] = labs(cluevals[j] - grid[i]);
 		    break;
 		  case C_DIV:
 		    {
@@ -1534,7 +1534,7 @@ static int check_errors(const game_state *state, long *errors)
 		cluevals[j] *= state->grid[i];
 		break;
 	      case C_SUB:
-		cluevals[j] = abs(cluevals[j] - state->grid[i]);
+		cluevals[j] = labs(cluevals[j] - state->grid[i]);
 		break;
 	      case C_DIV:
 		{
diff --git a/mkfiles.pl b/mkfiles.pl
index 20fd7e0..142f7ca 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1707,7 +1707,7 @@ if (defined $makefiles{'nestedvm'}) {
 if (defined $makefiles{'osx'}) {
     $mftyp = 'osx';
     $dirpfx = &dirpfx($makefiles{'osx'}, "/");
-    @osxarchs = ('i386');
+    @osxarchs = ('i386', 'x86_64');
 
     ##-- Mac OS X makefile
     open OUT, ">$makefiles{'osx'}"; select OUT;