zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enable 64-bit osx build and fix a warning.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

4
keen.c
View File

@ -1101,7 +1101,7 @@ done
cluevals[j] *= grid[i]; cluevals[j] *= grid[i];
break; break;
case C_SUB: case C_SUB:
cluevals[j] = abs(cluevals[j] - grid[i]); cluevals[j] = labs(cluevals[j] - grid[i]);
break; break;
case C_DIV: case C_DIV:
{ {
@ -1534,7 +1534,7 @@ static int check_errors(const game_state *state, long *errors)
cluevals[j] *= state->grid[i]; cluevals[j] *= state->grid[i];
break; break;
case C_SUB: case C_SUB:
cluevals[j] = abs(cluevals[j] - state->grid[i]); cluevals[j] = labs(cluevals[j] - state->grid[i]);
break; break;
case C_DIV: case C_DIV:
{ {

2
mkfiles.pl
View File

@ -1707,7 +1707,7 @@ if (defined $makefiles{'nestedvm'}) {
if (defined $makefiles{'osx'}) { if (defined $makefiles{'osx'}) {
$mftyp = 'osx'; $mftyp = 'osx';
$dirpfx = &dirpfx($makefiles{'osx'}, "/"); $dirpfx = &dirpfx($makefiles{'osx'}, "/");
@osxarchs = ('i386'); @osxarchs = ('i386', 'x86_64');
##-- Mac OS X makefile ##-- Mac OS X makefile
open OUT, ">$makefiles{'osx'}"; select OUT; open OUT, ">$makefiles{'osx'}"; select OUT;