diff options
| author | Franklin Wei <git@fwei.tk> | 2018-06-20 19:13:03 -0400 |
|---|---|---|
| committer | Franklin Wei <git@fwei.tk> | 2018-06-20 19:13:03 -0400 |
| commit | d64ff86fb6be22875cfae054f8a878dbd8b1472b (patch) | |
| tree | 64f09b043bd7f1b2a327c2bf5f1517353b8884f9 /apps/plugins/puzzles/src/mkfiles.pl | |
| parent | 708a54d3de31ef76f524baeb0f5c2697589e93d7 (diff) | |
| download | rockbox-d64ff86fb6be22875cfae054f8a878dbd8b1472b.tar.gz rockbox-d64ff86fb6be22875cfae054f8a878dbd8b1472b.zip | |
puzzles: resync with upstream
This brings the source to upstream commit 506b073 (though I have made some
extra commits on top of that). Notably this includes a fix for a double-free
bug that I myself introduced upstream.
Change-Id: I02671586bbc34d63e05398ee971271fed42538cf
Diffstat (limited to 'apps/plugins/puzzles/src/mkfiles.pl')
| -rwxr-xr-x | apps/plugins/puzzles/src/mkfiles.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/plugins/puzzles/src/mkfiles.pl b/apps/plugins/puzzles/src/mkfiles.pl index 20fd7e0f46..142f7ca252 100755 --- a/apps/plugins/puzzles/src/mkfiles.pl +++ b/apps/plugins/puzzles/src/mkfiles.pl | |||
| @@ -1707,7 +1707,7 @@ if (defined $makefiles{'nestedvm'}) { | |||
| 1707 | if (defined $makefiles{'osx'}) { | 1707 | if (defined $makefiles{'osx'}) { |
| 1708 | $mftyp = 'osx'; | 1708 | $mftyp = 'osx'; |
| 1709 | $dirpfx = &dirpfx($makefiles{'osx'}, "/"); | 1709 | $dirpfx = &dirpfx($makefiles{'osx'}, "/"); |
| 1710 | @osxarchs = ('i386'); | 1710 | @osxarchs = ('i386', 'x86_64'); |
| 1711 | 1711 | ||
| 1712 | ##-- Mac OS X makefile | 1712 | ##-- Mac OS X makefile |
| 1713 | open OUT, ">$makefiles{'osx'}"; select OUT; | 1713 | open OUT, ">$makefiles{'osx'}"; select OUT; |