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.
This commit is contained in:
Josh Lee
2018-05-29 08:09:01 -04:00
committed by Simon Tatham
parent 7edbee6cb2
commit 32f96080ad
3 changed files with 5 additions and 3 deletions

2
.gitignore vendored
View File

@ -97,8 +97,10 @@
/org
/*.ppc
/*.i386
/*.x86_64
/Puzzles.ppc.bin
/Puzzles.i386.bin
/Puzzles.x86_64.bin
/version2.def
/preprocessed.but
/*.a

4
keen.c
View File

@ -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:
{

View File

@ -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;