Updated mame to 0.173. It's the end of another month, and time for a new MAME release. This time there are more improvements for capabilities we have added in previous versions. MAME now includes ports of some popular shaders for the BGFX renderer, including the EAGLE, HQx and xBR scaling effects. Please be aware that the BGFX renderer is still a work in progress, and you may experience some stability issues when using it. This release introduces a new cheat engine based on the Lua scripting language. This opens the door to exciting new possibilities. One of the most significant improvements is better support for systems with banked memory, including many 8-bit home computers like the Apple II family. MAME's archive file handling has been improved in a number of ways. ZIP64 format is now supported, allowing MAME to archives over 4GiB in size. This mean that, for example, large flyer collections don't need to be unzipped for use with the internal UI. 7zip support has been updated for the latest 7zip release, including new archive features and many bug fixes. We've also fixed a number of bugs in the internal file browser. Of course this release also includes many other improvements from the MAME team and external contributors.diff -r1.55 -r1.56 pkgsrc/emulators/mame/Makefile
(wiz)
@@ -1,29 +1,30 @@ | @@ -1,29 +1,30 @@ | |||
1 | # $NetBSD: Makefile,v 1.55 2016/04/14 21:47:07 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.56 2016/04/29 08:30:50 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= mame-0.172 | 3 | DISTNAME= mame-0.173 | |
4 | CATEGORIES= emulators | 4 | CATEGORIES= emulators | |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} | |
6 | GITHUB_TAG= ${DISTNAME:S/-//S/.//} | 6 | GITHUB_TAG= ${DISTNAME:S/-//S/.//} | |
7 | 7 | |||
8 | MAINTAINER= wiz@NetBSD.org | 8 | MAINTAINER= wiz@NetBSD.org | |
9 | HOMEPAGE= http://www.mamedev.org/ | 9 | HOMEPAGE= http://www.mamedev.org/ | |
10 | COMMENT= Multiple Arcade Machine Emulator | 10 | COMMENT= Multiple Arcade Machine Emulator | |
11 | LICENSE= modified-bsd AND gnu-gpl-v2 | 11 | LICENSE= modified-bsd AND gnu-gpl-v2 | |
12 | 12 | |||
13 | DOCDIR= share/doc/mame | 13 | DOCDIR= share/doc/mame | |
14 | SHAREDIR= share/mame | 14 | SHAREDIR= share/mame | |
15 | INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6 | 15 | INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6 | |
16 | INSTALLATION_DIRS+= ${SHAREDIR}/artwork ${SHAREDIR}/hash | 16 | INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/border_blur | |
17 | INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/chains ${SHAREDIR}/hash | |||
17 | 18 | |||
18 | RESTRICTED= selling is not allowed | 19 | RESTRICTED= selling is not allowed | |
19 | NO_SRC_ON_CDROM= ${RESTRICTED} | 20 | NO_SRC_ON_CDROM= ${RESTRICTED} | |
20 | NO_BIN_ON_CDROM= ${RESTRICTED} | 21 | NO_BIN_ON_CDROM= ${RESTRICTED} | |
21 | 22 | |||
22 | DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf | 23 | DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf | |
23 | 24 | |||
24 | USE_LANGUAGES= c99 c++ | 25 | USE_LANGUAGES= c99 c++ | |
25 | # 4.9 is enough, but doesn't build with SSP support on NetBSD | 26 | # 4.9 is enough, but doesn't build with SSP support on NetBSD | |
26 | GCC_REQD= 5.3 | 27 | GCC_REQD= 5.3 | |
27 | USE_TOOLS+= bsdtar gmake pkg-config | 28 | USE_TOOLS+= bsdtar gmake pkg-config | |
28 | UNLIMIT_RESOURCES+= datasize | 29 | UNLIMIT_RESOURCES+= datasize | |
29 | MAKE_FILE= makefile | 30 | MAKE_FILE= makefile | |
@@ -96,33 +97,36 @@ PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # | @@ -96,33 +97,36 @@ PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # | |||
96 | 97 | |||
97 | post-extract: | 98 | post-extract: | |
98 | # will be chosen in preference to /usr/include/signal.h, but does not provide kill() | 99 | # will be chosen in preference to /usr/include/signal.h, but does not provide kill() | |
99 | ${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h | 100 | ${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h | |
100 | 101 | |||
101 | pre-build: | 102 | pre-build: | |
102 | # problems with mame-specific png.h | 103 | # problems with mame-specific png.h | |
103 | ${RM} -f ${WRKDIR}/.buildlink/include/png* | 104 | ${RM} -f ${WRKDIR}/.buildlink/include/png* | |
104 | 105 | |||
105 | do-install: | 106 | do-install: | |
106 | ${INSTALL_PROGRAM} ${WRKSRC}/mame64 ${DESTDIR}${PREFIX}/bin/mame | 107 | ${INSTALL_PROGRAM} ${WRKSRC}/mame64 ${DESTDIR}${PREFIX}/bin/mame | |
107 | set -e; \ | 108 | set -e; \ | |
108 | for prg in castool chdman floptool imgtool jedutil ldresample ldverify \ | 109 | for prg in castool chdman floptool imgtool jedutil ldresample ldverify \ | |
109 | nltool pngcmp regrep romcmp split src2html srcclean testkeys unidasm; \ | 110 | nltool nlwav pngcmp regrep romcmp split src2html srcclean unidasm; \ | |
110 | do \ | 111 | do \ | |
111 | ${INSTALL_PROGRAM} ${WRKSRC}/"$$prg" ${DESTDIR}${PREFIX}/bin; \ | 112 | ${INSTALL_PROGRAM} ${WRKSRC}/"$$prg" ${DESTDIR}${PREFIX}/bin; \ | |
112 | done | 113 | done | |
113 | ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | 114 | ${INSTALL_DATA} ${WRKSRC}/docs/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | |
114 | ${INSTALL_DATA} ${WRKSRC}/src/osd/sdl/man/*.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6 | 115 | ${INSTALL_DATA} ${WRKSRC}/docs/man/*.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6 | |
115 | ${INSTALL_DATA} ${WRKSRC}/artwork/* ${DESTDIR}${PREFIX}/${SHAREDIR}/artwork | 116 | ${INSTALL_DATA} ${WRKSRC}/artwork/LICENSE ${DESTDIR}${PREFIX}/${SHAREDIR}/artwork | |
117 | ${INSTALL_DATA} ${WRKSRC}/artwork/*.* ${DESTDIR}${PREFIX}/${SHAREDIR}/artwork | |||
118 | ${INSTALL_DATA} ${WRKSRC}/artwork/bgfx/border_blur/* ${DESTDIR}${PREFIX}/${SHAREDIR}/artwork/bgfx/border_blur | |||
119 | ${INSTALL_DATA} ${WRKSRC}/artwork/bgfx/chains/* ${DESTDIR}${PREFIX}/${SHAREDIR}/artwork/bgfx/chains | |||
116 | ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/${DOCDIR} | 120 | ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/${DOCDIR} | |
117 | ${INSTALL_DATA} ${WRKSRC}/hash/* ${DESTDIR}${PREFIX}/${SHAREDIR}/hash | 121 | ${INSTALL_DATA} ${WRKSRC}/hash/* ${DESTDIR}${PREFIX}/${SHAREDIR}/hash | |
118 | 122 | |||
119 | .include "../../lang/python/application.mk" | 123 | .include "../../lang/python/application.mk" | |
120 | .include "../../audio/flac/buildlink3.mk" | 124 | .include "../../audio/flac/buildlink3.mk" | |
121 | .include "../../devel/GConf/buildlink3.mk" | 125 | .include "../../devel/GConf/buildlink3.mk" | |
122 | .include "../../devel/SDL2/buildlink3.mk" | 126 | .include "../../devel/SDL2/buildlink3.mk" | |
123 | .include "../../devel/zlib/buildlink3.mk" | 127 | .include "../../devel/zlib/buildlink3.mk" | |
124 | .include "../../databases/sqlite3/buildlink3.mk" | 128 | .include "../../databases/sqlite3/buildlink3.mk" | |
125 | .include "../../fonts/SDL2_ttf/buildlink3.mk" | 129 | .include "../../fonts/SDL2_ttf/buildlink3.mk" | |
126 | .include "../../mk/jpeg.buildlink3.mk" | 130 | .include "../../mk/jpeg.buildlink3.mk" | |
127 | .include "../../textproc/expat/buildlink3.mk" | 131 | .include "../../textproc/expat/buildlink3.mk" | |
128 | .include "../../x11/libXinerama/buildlink3.mk" | 132 | .include "../../x11/libXinerama/buildlink3.mk" |
@@ -1,30 +1,30 @@ | @@ -1,30 +1,30 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.12 2016/04/14 21:47:07 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.13 2016/04/29 08:30:50 wiz Exp $ | |
2 | bin/castool | 2 | bin/castool | |
3 | bin/chdman | 3 | bin/chdman | |
4 | bin/floptool | 4 | bin/floptool | |
5 | bin/imgtool | 5 | bin/imgtool | |
6 | bin/jedutil | 6 | bin/jedutil | |
7 | bin/ldresample | 7 | bin/ldresample | |
8 | bin/ldverify | 8 | bin/ldverify | |
9 | bin/mame | 9 | bin/mame | |
10 | bin/nltool | 10 | bin/nltool | |
11 | bin/nlwav | |||
11 | bin/pngcmp | 12 | bin/pngcmp | |
12 | bin/regrep | 13 | bin/regrep | |
13 | bin/romcmp | 14 | bin/romcmp | |
14 | bin/split | 15 | bin/split | |
15 | bin/src2html | 16 | bin/src2html | |
16 | bin/srcclean | 17 | bin/srcclean | |
17 | bin/testkeys | |||
18 | bin/unidasm | 18 | bin/unidasm | |
19 | man/man1/castool.1 | 19 | man/man1/castool.1 | |
20 | man/man1/chdman.1 | 20 | man/man1/chdman.1 | |
21 | man/man1/floptool.1 | 21 | man/man1/floptool.1 | |
22 | man/man1/imgtool.1 | 22 | man/man1/imgtool.1 | |
23 | man/man1/jedutil.1 | 23 | man/man1/jedutil.1 | |
24 | man/man1/ldplayer.1 | 24 | man/man1/ldplayer.1 | |
25 | man/man1/ldresample.1 | 25 | man/man1/ldresample.1 | |
26 | man/man1/ldverify.1 | 26 | man/man1/ldverify.1 | |
27 | man/man1/romcmp.1 | 27 | man/man1/romcmp.1 | |
28 | man/man1/testkeys.1 | 28 | man/man1/testkeys.1 | |
29 | man/man6/mame.6 | 29 | man/man6/mame.6 | |
30 | man/man6/mess.6 | 30 | man/man6/mess.6 | |
@@ -32,26 +32,30 @@ share/doc/mame/SDL.txt | @@ -32,26 +32,30 @@ share/doc/mame/SDL.txt | |||
32 | share/doc/mame/config.txt | 32 | share/doc/mame/config.txt | |
33 | share/doc/mame/emscripten.txt | 33 | share/doc/mame/emscripten.txt | |
34 | share/doc/mame/floppy.txt | 34 | share/doc/mame/floppy.txt | |
35 | share/doc/mame/hlsl.txt | 35 | share/doc/mame/hlsl.txt | |
36 | share/doc/mame/imgtool.txt | 36 | share/doc/mame/imgtool.txt | |
37 | share/doc/mame/m6502.txt | 37 | share/doc/mame/m6502.txt | |
38 | share/doc/mame/mame.txt | 38 | share/doc/mame/mame.txt | |
39 | share/doc/mame/newvideo.txt | 39 | share/doc/mame/newvideo.txt | |
40 | share/doc/mame/nscsi.txt | 40 | share/doc/mame/nscsi.txt | |
41 | share/doc/mame/windows.txt | 41 | share/doc/mame/windows.txt | |
42 | share/mame/artwork/LICENSE | 42 | share/mame/artwork/LICENSE | |
43 | share/mame/artwork/README.md | 43 | share/mame/artwork/README.md | |
44 | share/mame/artwork/aperture-grille.png | 44 | share/mame/artwork/aperture-grille.png | |
45 | share/mame/artwork/bgfx/border_blur/default.lay | |||
46 | share/mame/artwork/bgfx/chains/hq2x.png | |||
47 | share/mame/artwork/bgfx/chains/hq3x.png | |||
48 | share/mame/artwork/bgfx/chains/hq4x.png | |||
45 | share/mame/artwork/monochrome-chessboard.png | 49 | share/mame/artwork/monochrome-chessboard.png | |
46 | share/mame/artwork/monochrome-matrix.png | 50 | share/mame/artwork/monochrome-matrix.png | |
47 | share/mame/artwork/shadow-mask.png | 51 | share/mame/artwork/shadow-mask.png | |
48 | share/mame/artwork/slot-mask-aligned.png | 52 | share/mame/artwork/slot-mask-aligned.png | |
49 | share/mame/artwork/slot-mask.png | 53 | share/mame/artwork/slot-mask.png | |
50 | share/mame/artwork/white.png | 54 | share/mame/artwork/white.png | |
51 | share/mame/hash/32x.xml | 55 | share/mame/hash/32x.xml | |
52 | share/mame/hash/3do_m2.xml | 56 | share/mame/hash/3do_m2.xml | |
53 | share/mame/hash/LICENSE | 57 | share/mame/hash/LICENSE | |
54 | share/mame/hash/README.md | 58 | share/mame/hash/README.md | |
55 | share/mame/hash/a2600.xml | 59 | share/mame/hash/a2600.xml | |
56 | share/mame/hash/a2600_cass.xml | 60 | share/mame/hash/a2600_cass.xml | |
57 | share/mame/hash/a5200.hsi | 61 | share/mame/hash/a5200.hsi | |
@@ -311,26 +315,27 @@ share/mame/hash/p500_flop.xml | @@ -311,26 +315,27 @@ share/mame/hash/p500_flop.xml | |||
311 | share/mame/hash/partner_cass.xml | 315 | share/mame/hash/partner_cass.xml | |
312 | share/mame/hash/partner_flop.xml | 316 | share/mame/hash/partner_flop.xml | |
313 | share/mame/hash/pasogo.xml | 317 | share/mame/hash/pasogo.xml | |
314 | share/mame/hash/pb2000c.xml | 318 | share/mame/hash/pb2000c.xml | |
315 | share/mame/hash/pc1000.xml | 319 | share/mame/hash/pc1000.xml | |
316 | share/mame/hash/pc1512.xml | 320 | share/mame/hash/pc1512.xml | |
317 | share/mame/hash/pc1640.xml | 321 | share/mame/hash/pc1640.xml | |
318 | share/mame/hash/pc8201.xml | 322 | share/mame/hash/pc8201.xml | |
319 | share/mame/hash/pc8801_cass.xml | 323 | share/mame/hash/pc8801_cass.xml | |
320 | share/mame/hash/pc8801_flop.xml | 324 | share/mame/hash/pc8801_flop.xml | |
321 | share/mame/hash/pc88va.xml | 325 | share/mame/hash/pc88va.xml | |
322 | share/mame/hash/pc98.xml | 326 | share/mame/hash/pc98.xml | |
323 | share/mame/hash/pce.xml | 327 | share/mame/hash/pce.xml | |
328 | share/mame/hash/pce_tourvision.xml | |||
324 | share/mame/hash/pcecd.xml | 329 | share/mame/hash/pcecd.xml | |
325 | share/mame/hash/pcw.xml | 330 | share/mame/hash/pcw.xml | |
326 | share/mame/hash/pcw16.xml | 331 | share/mame/hash/pcw16.xml | |
327 | share/mame/hash/pecom_cass.xml | 332 | share/mame/hash/pecom_cass.xml | |
328 | share/mame/hash/pegasus_cart.xml | 333 | share/mame/hash/pegasus_cart.xml | |
329 | share/mame/hash/pencil2.xml | 334 | share/mame/hash/pencil2.xml | |
330 | share/mame/hash/pentagon_cass.xml | 335 | share/mame/hash/pentagon_cass.xml | |
331 | share/mame/hash/pet_cass.xml | 336 | share/mame/hash/pet_cass.xml | |
332 | share/mame/hash/pet_flop.xml | 337 | share/mame/hash/pet_flop.xml | |
333 | share/mame/hash/pet_hdd.xml | 338 | share/mame/hash/pet_hdd.xml | |
334 | share/mame/hash/pet_rom.xml | 339 | share/mame/hash/pet_rom.xml | |
335 | share/mame/hash/pico.xml | 340 | share/mame/hash/pico.xml | |
336 | share/mame/hash/pippin.xml | 341 | share/mame/hash/pippin.xml |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.50 2016/04/14 21:47:07 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.51 2016/04/29 08:30:50 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (mame-0.172.tar.gz) = f6ea29f7880a05f8d835c538f4316bd4b0adad18 | 3 | SHA1 (mame-0.173.tar.gz) = 682035727ac201384d36a28c4ad0ca90011f321c | |
4 | RMD160 (mame-0.172.tar.gz) = b2cff1f9890091efec09ed774e20f7510747060b | 4 | RMD160 (mame-0.173.tar.gz) = 5f093104d36976fa28ce345e18a5f63ad1b59169 | |
5 | SHA512 (mame-0.172.tar.gz) = cf6f4a8da6c8e19ec81da5a79c6d2d0b9b6a687d5103e7010e83566a1eb24a829765c4964e2dbcbf7aa2ea6fe7f1f19faf9b4b0a9051e669bd0f33a8cd58a269 | 5 | SHA512 (mame-0.173.tar.gz) = 731e94af1cde80ce0d62a4ff65ed7b1de97ed0e84633396eb9ec6e3a10d5da0717424f277fcbde5cd64a622a669ea7776047837d8f86f8baf6f077916eb982ee | |
6 | Size (mame-0.172.tar.gz) = 97300980 bytes | 6 | Size (mame-0.173.tar.gz) = 98395748 bytes | |
7 | SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = e39b2dff553505531adb5f0a31b0a22306b8e2e4 | 7 | SHA1 (patch-3rdparty_bgfx_examples_common_font_font__manager.cpp) = e39b2dff553505531adb5f0a31b0a22306b8e2e4 | |
8 | SHA1 (patch-3rdparty_bx_include_bx_thread.h) = 779c8b750a3ae5d50d12c6430678ada64a4b82ed | 8 | SHA1 (patch-3rdparty_bx_include_bx_thread.h) = 779c8b750a3ae5d50d12c6430678ada64a4b82ed | |
9 | SHA1 (patch-3rdparty_libuv_src_unix_netbsd.c) = 63d2378c19cbbcb71d7540e088c3bdf5940f4dc6 | 9 | SHA1 (patch-3rdparty_libuv_src_unix_netbsd.c) = 63d2378c19cbbcb71d7540e088c3bdf5940f4dc6 | |
10 | SHA1 (patch-makefile) = 0be740e7d61cdaa66c1c415f84344b37da267a45 | 10 | SHA1 (patch-makefile) = 0be740e7d61cdaa66c1c415f84344b37da267a45 | |
11 | SHA1 (patch-scripts_genie.lua) = 8bcb97215fcc379b34f893d53843533630d0f26e | 11 | SHA1 (patch-scripts_genie.lua) = f0b6b9fe00b6f572089fc2a7495fe1fd3c86ae4e | |
12 | SHA1 (patch-scripts_src_3rdparty.lua) = 306917af65da601667ffc9ffaf7b8092a2d03ef7 | 12 | SHA1 (patch-scripts_src_3rdparty.lua) = 306917af65da601667ffc9ffaf7b8092a2d03ef7 |
@@ -1,67 +1,88 @@ | @@ -1,67 +1,88 @@ | |||
1 | $NetBSD: patch-scripts_genie.lua,v 1.2 2016/04/14 21:47:07 wiz Exp $ | 1 | $NetBSD: patch-scripts_genie.lua,v 1.3 2016/04/29 08:30:50 wiz Exp $ | |
2 | 2 | |||
3 | Detect clang correctly. | 3 | Precompilation is broken on NetBSD with gcc-5.3. | |
4 | Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD. | 4 | Use GNU version of the C++ standard to avoid trouble with alloca on NetBSD. | |
5 | Detect clang correctly. | |||
5 | 6 | |||
6 | --- scripts/genie.lua.orig 2016-03-30 09:03:03.000000000 +0000 | 7 | --- scripts/genie.lua.orig 2016-04-27 06:13:59.000000000 +0000 | |
7 | +++ scripts/genie.lua | 8 | +++ scripts/genie.lua | |
8 | @@ -672,22 +672,22 @@ local version = str_to_version(_OPTIONS[ | 9 | @@ -65,11 +65,6 @@ function layoutbuildtask(_folder, _name) | |
10 | end | |||
11 | ||||
12 | function precompiledheaders() | |||
13 | - if _OPTIONS["precompile"]==nil or (_OPTIONS["precompile"]~=nil and _OPTIONS["precompile"]=="1") then | |||
14 | - configuration { "not xcode4" } | |||
15 | - pchheader("emu.h") | |||
16 | - configuration { } | |||
17 | - end | |||
18 | end | |||
19 | ||||
20 | function addprojectflags() | |||
21 | @@ -692,22 +687,22 @@ local version = str_to_version(_OPTIONS[ | |||
9 | if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then | 22 | if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then | |
10 | buildoptions_cpp { | 23 | buildoptions_cpp { | |
11 | "-x c++", | 24 | "-x c++", | |
12 | - "-std=c++1y", | 25 | - "-std=c++1y", | |
13 | + "-std=gnu++1y", | 26 | + "-std=gnu++1y", | |
14 | } | 27 | } | |
15 | 28 | |||
16 | buildoptions_objc { | 29 | buildoptions_objc { | |
17 | "-x objective-c++", | 30 | "-x objective-c++", | |
18 | - "-std=c++1y", | 31 | - "-std=c++1y", | |
19 | + "-std=gnu++1y", | 32 | + "-std=gnu++1y", | |
20 | } | 33 | } | |
21 | else | 34 | else | |
22 | buildoptions_cpp { | 35 | buildoptions_cpp { | |
23 | "-x c++", | 36 | "-x c++", | |
24 | - "-std=c++14", | 37 | - "-std=c++14", | |
25 | + "-std=gnu++14", | 38 | + "-std=gnu++14", | |
26 | } | 39 | } | |
27 | 40 | |||
28 | buildoptions_objc { | 41 | buildoptions_objc { | |
29 | "-x objective-c++", | 42 | "-x objective-c++", | |
30 | - "-std=c++14", | 43 | - "-std=c++14", | |
31 | + "-std=gnu++14", | 44 | + "-std=gnu++14", | |
32 | } | 45 | } | |
33 | end | 46 | end | |
34 | -- this speeds it up a bit by piping between the preprocessor/compiler/assembler | 47 | -- this speeds it up a bit by piping between the preprocessor/compiler/assembler | |
35 | @@ -933,7 +933,17 @@ end | 48 | @@ -950,7 +945,17 @@ end | |
36 | 49 | |||
37 | 50 | |||
38 | local version = str_to_version(_OPTIONS["gcc_version"]) | 51 | local version = str_to_version(_OPTIONS["gcc_version"]) | |
39 | - if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then | 52 | - if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then | |
40 | + if _OPTIONS["clang_version"] == "" then | 53 | + if _OPTIONS["clang_version"] == "" then | |
41 | + if (version < 40900) then | 54 | + if (version < 40900) then | |
42 | + print("GCC version 4.9 or later needed") | 55 | + print("GCC version 4.9 or later needed") | |
43 | + os.exit(-1) | 56 | + os.exit(-1) | |
44 | + end | 57 | + end | |
45 | + buildoptions { | 58 | + buildoptions { | |
46 | + "-Wno-unused-result", -- needed for fgets,fread on linux | 59 | + "-Wno-unused-result", -- needed for fgets,fread on linux | |
47 | + -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds) | 60 | + -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds) | |
48 | + "-Wno-array-bounds", | 61 | + "-Wno-array-bounds", | |
49 | + } | 62 | + } | |
50 | + else | 63 | + else | |
51 | if (version < 30400) then | 64 | if (version < 30400) then | |
52 | print("Clang version 3.4 or later needed") | 65 | print("Clang version 3.4 or later needed") | |
53 | os.exit(-1) | 66 | os.exit(-1) | |
54 | @@ -959,16 +969,6 @@ end | 67 | @@ -963,7 +968,6 @@ end | |
68 | "-Wno-inline-new-delete", | |||
69 | "-Wno-constant-logical-operand", | |||
70 | "-Wno-deprecated-register", | |||
71 | - "-fdiagnostics-show-note-include-stack", | |||
72 | } | |||
73 | if (version >= 30500) then | |||
74 | buildoptions { | |||
75 | @@ -977,16 +981,6 @@ end | |||
55 | "-Wno-tautological-undefined-compare", | 76 | "-Wno-tautological-undefined-compare", | |
56 | } | 77 | } | |
57 | end | 78 | end | |
58 | - else | 79 | - else | |
59 | - if (version < 40900) then | 80 | - if (version < 40900) then | |
60 | - print("GCC version 4.9 or later needed") | 81 | - print("GCC version 4.9 or later needed") | |
61 | - os.exit(-1) | 82 | - os.exit(-1) | |
62 | - end | 83 | - end | |
63 | - buildoptions { | 84 | - buildoptions { | |
64 | - "-Wno-unused-result", -- needed for fgets,fread on linux | 85 | - "-Wno-unused-result", -- needed for fgets,fread on linux | |
65 | - -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds) | 86 | - -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds) | |
66 | - "-Wno-array-bounds", | 87 | - "-Wno-array-bounds", | |
67 | - } | 88 | - } |