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 bc2d8ccc0f64c63e17801749193ba81238a30736..05dceb387185a153c247f1b7df5f77515ea5d85c 100644 (file)
--- 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 be77b183baec7497f3f94392338985dbd02d005e..423ec8c446e0f6ec208ade756424f1d2a3526e1d 100644 (file)
--- 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 20fd7e0f469ed30c14b826e03f7adb16d2fc6556..142f7ca25227b89866e9c96afa596122365c11cb 100755 (executable)
--- 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;