From 5506b54588734bfd7b9aef59232fe174648e013b Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 22 Oct 2023 16:52:24 -0700 Subject: [PATCH] Add support for build on Mac OSX <= 10.14 --- .gitignore | 1 + INSTALL.md | 21 ++++ config.sh | 4 + meson.build | 2 +- platinum.us/rom.sha1 | 2 +- platinum.us/sbins.sha1 | 246 +++++++++++++++++++------------------- tools/csv2bin/meson.build | 7 +- tools/knarc/meson.build | 4 +- tools/msgenc/meson.build | 7 +- 9 files changed, 163 insertions(+), 131 deletions(-) diff --git a/.gitignore b/.gitignore index 783e5b85a4..aab8070cde 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ sdk/ !tools/asmdiff/asmdiff.sh __pycache__ +.cache diff --git a/INSTALL.md b/INSTALL.md index 7f81f5957d..efca3c4901 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -91,6 +91,27 @@ You now have the choice between two different environments to use to build the p Continue with the [building instructions](#Downloading_the_repository) +## Mac OSX (<= 10.14) + +Apple bundles a number of the requisite utilities into Xcode Command Line Tools; to install these, run: + +``` +xcode-select --install +``` + +You will also need the following packages: + +* meson (>= 1.2.0) +* wine (to run the mwcc executables) + +These can be installed using Homebrew; if you do not have Homebrew installed, refer to the instructions [here](https://brew.sh/). Once Homebrew is installed, run: + +``` +brew update +brew install meson +brew install --cask wine-stable +``` + ## Linux Building the ROM requires the following packages. If you cannot find one or more of these using your package distribution, it may be under a different name. diff --git a/config.sh b/config.sh index 0c2a741d47..9c51a88003 100755 --- a/config.sh +++ b/config.sh @@ -48,11 +48,15 @@ if [ "$(uname -s)" = "Linux" ]; then native_file="native_unix.ini" cross_file="cross_unix.ini" fi +elif [ "$(uname -s)" = "Darwin" ]; then + native_file="native_unix.ini" + cross_file="cross_unix.ini" else native_file="native.ini" cross_file="cross.ini" fi +touch "$build/.mwconfig" export MWCONFIG="$(realpath -- "$build/.mwconfig")" if [ "$native_file" = "native_unix.ini" ]; then diff --git a/meson.build b/meson.build index 9639c33369..c9b2735072 100644 --- a/meson.build +++ b/meson.build @@ -219,7 +219,7 @@ pokeplatinum_nds = custom_target('pokeplatinum.us.nds', ############################################################ ### TESTS ### ############################################################ -sha1sum = find_program('sha1sum', native: true) +sha1sum = find_program(['sha1sum', 'shasum'], native: true) test('SBIN Checksums', sha1sum, diff --git a/platinum.us/rom.sha1 b/platinum.us/rom.sha1 index 29de24dd18..08fe03b06c 100644 --- a/platinum.us/rom.sha1 +++ b/platinum.us/rom.sha1 @@ -1 +1 @@ -ce81046eda7d232513069519cb2085349896dec7 pokeplatinum.us.nds +ce81046eda7d232513069519cb2085349896dec7 *pokeplatinum.us.nds diff --git a/platinum.us/sbins.sha1 b/platinum.us/sbins.sha1 index def9472ec4..a77d6ec573 100644 --- a/platinum.us/sbins.sha1 +++ b/platinum.us/sbins.sha1 @@ -1,123 +1,123 @@ -6b61f25c1542f05dbdab54cf2dfaad9914555d07 main.sbin -de8a847bff8c343d69b853a215e6ee775ef2ef96 overlay0.sbin -906b5d19e6478a795eda151c771ff3a47fb1a8d5 overlay1.sbin -de8a847bff8c343d69b853a215e6ee775ef2ef96 overlay2.sbin -de8a847bff8c343d69b853a215e6ee775ef2ef96 overlay3.sbin -2527b3e0bbc7cf76e9125c8215043faf84ef0af2 overlay4.sbin -0456f78ac3e294722f669c793fc9727b23b66fba overlay5.sbin -6e5ed74d5bdb94d2ce78d8990c364b4766eab772 overlay6.sbin -fef29cf33d4dfd1f068a7b67798e7b5950fce749 overlay7.sbin -9d381061f1a7c6cccb731871aa8e7013848709cd overlay8.sbin -ba1a20a286990d2d318af29cd6e8dad389d45504 overlay9.sbin -05ab4e12c01211ce4305bde303e06ce11dda78af overlay10.sbin -a6dc7a7e32c14081b5db5a0a5e1e5120bebe52a9 overlay11.sbin -fa28629441497607e072a3aceebfb6d167457020 overlay12.sbin -8b64b97469bff5dc372b5178baa4676f7b2bcfc2 overlay13.sbin -d9b09c1e37088d6aaeb73143ecec98ab3327ec67 overlay14.sbin -de8a847bff8c343d69b853a215e6ee775ef2ef96 overlay15.sbin -b058a62fb8e4d646bb7508f5a21e406591f809c1 overlay16.sbin -543c0afabc3d90310f1bc8d4902743461dfdc1e5 overlay17.sbin -111fe69ca18026aa8574b8f79a6b94ef73715267 overlay18.sbin -d414d37a9b80f1d346666ad9ef5ba635d5ebb552 overlay19.sbin -7534ad61985affc27e8b121a6645b825ffae48c7 overlay20.sbin -6dd9a720fe069aedd9107398c16ba93e57769c64 overlay21.sbin -41ad74512da8c556fc28f8bf41ad77156d3d4cc9 overlay22.sbin -2e8fcd133e2736d90dae6e23ac9a669cefc1a7c8 overlay23.sbin -cc4bb361071632627532c48af9a0b37c1751670a overlay24.sbin -0fbd0432432d42462b9c02f07e30634987708dc6 overlay25.sbin -44e45c2b6ec6aa74142550f25f770954b8e0d555 overlay26.sbin -3301af166bc328d4df4412dbf6c740635151867c overlay27.sbin -98a048c770a311a3fd756ad725997964fdd14aa8 overlay28.sbin -ca63341e12e782896fc58d5ce6fefa2170b5e921 overlay29.sbin -d18ad1ad381bb674c840d1a0435ff39c17c5488f overlay30.sbin -f6c50384fcfc828ccc29aaf89540b7529c981931 overlay31.sbin -eac8d17d2e5301cd7b2d7ba507f2ecd1df9d59cd overlay32.sbin -dfab77a2a03414852a047b45eabec7d3367fca58 overlay33.sbin -cd5d643c3bf17d863db96640d7bfc100bda30b37 overlay34.sbin -4410caba494af7c853ef7f1a4a2ac4d8243f5a18 overlay35.sbin -09d6d7c195d109d31c8f890711f562ae2e219cfd overlay36.sbin -212e5bc9a6036f4c0be02d65bbba5feed12c5d53 overlay37.sbin -3f15b19c0ca694b9942077a9c8eda0855c25450c overlay38.sbin -da2f09fdfc788b4a6e6ada88db5176fcdc23c924 overlay39.sbin -f8a583401a3a614cc88ee6dc7f3b3cdbf00f22cb overlay40.sbin -a5b13f54d5303140b3169c794db0fd04c9c2dc22 overlay41.sbin -ba5baba0ff38e940d333dbea89e4c510b6998922 overlay42.sbin -261b64d5fd09a304a5d7e78a18b44a6ecfe7ec93 overlay43.sbin -5dd962600f238f162c0999dcb8a134c9df134293 overlay44.sbin -e722ce81a98e1d78011e179f008a4cac37e20610 overlay45.sbin -87cd3ac2574737177d399a8cf8a8374c9599e38b overlay46.sbin -b38da9fe733a6a1213ff217f4e2788e3ae2011a4 overlay47.sbin -70266035d948ee5a826b06a3a1b908a50af050c9 overlay48.sbin -489ae29169ae71eb72909fdebdd0aa8bf8ca63f4 overlay49.sbin -2c6a1fb46550bdb140c677e37ae06779b84e7c3e overlay50.sbin -13069defd90d47eebe9eb4a48974e82369614fa7 overlay51.sbin -4963a7d852a9691cdd9382f42c527d0c457fb520 overlay52.sbin -26f0a9bd0e207a3260cb3a04e268a20b3d2c52d2 overlay53.sbin -395bbb8597227e687f61cea574c2219c7c77d1d1 overlay54.sbin -ea68f11d110d5929d18eeaad9cf3f1792986ab7f overlay55.sbin -1b89fbbf7576f21608df1334606ed2e77f5e21ea overlay56.sbin -88b06ba661770c8feef9ec96bcee6942819fbda4 overlay57.sbin -9b7c8c69b165a8a4f1da4ff4fc73bdc0af52def8 overlay58.sbin -43b9d869fc580cb7e6af6ef95cbbc015b5542d50 overlay59.sbin -0a0cfedfb93a08ff8fd187d6e62a5c9a1e3056cc overlay60.sbin -a5f5fb58639672291dc9328f8659fdea0a1329ee overlay61.sbin -d073752e86af2a435978fed11ce5557c5dc3b3ac overlay62.sbin -75595fd5704b4ffdce5e32160e35506e166d2122 overlay63.sbin -d2a6ce95570f7eddb8cbfbe0fd8317d54c48cb1d overlay64.sbin -974d51ed28bab8005a761ab10f0caf3232ca75b0 overlay65.sbin -1dd7362a44183422c084958e4356c4c65b23ebbe overlay66.sbin -3565015a195a71e06e0c56ef638f06116f27e597 overlay67.sbin -6c90858a9f97833957e94da68513a90b7ea16dfa overlay68.sbin -c655f6874e4e9897f3f0782af1140cedd97154da overlay69.sbin -b80c7e652b63a37f2a30b9c0f14d6e5608185d05 overlay70.sbin -cf86b18a15a2b011fd0e7c98379a9fa228c3fc4c overlay71.sbin -39a79a31811cac6b1a90206e67624c0a3179bd46 overlay72.sbin -deecf01a5608b25883804ef30c9d4c3d0c904ee5 overlay73.sbin -21e3d2a2fb36d739f4fd16792719bf6fa7b7e6aa overlay74.sbin -88ceed815cb9a2ef6e0d2dcedd2fc126e717c165 overlay75.sbin -13777fa8b44e026c4eb960cce2309451c4594726 overlay76.sbin -d7a304050d0049809b21cf75937e4d14aaf858c5 overlay77.sbin -8571cf57764db093c9ce385586894659297b783e overlay78.sbin -b8c85f32459d20b3a6cfde5a1e349215dd0157a0 overlay79.sbin -0ba83af5f2cafb311dbc552d77cb1b6b4f45d34e overlay80.sbin -1982ed52ba9469dd625dc5951277fd1c001b26af overlay81.sbin -429a576c3e5a24f25167051957b22f194d2af781 overlay82.sbin -1904a30bcfb722856130ab7b3d0e79fd0070520d overlay83.sbin -8bd6a805631e2d661f9d5889e568a72e60f93a04 overlay84.sbin -c197c9edb988d64dec0a56427dfc6960646dc1f7 overlay85.sbin -a563e0430b460ee5a39442667561e0bd5428dcdb overlay86.sbin -8c7f762ebf90f08b09b9efd49946176bb6ed1c69 overlay87.sbin -ca9016bf18dc6efc3490bfb893f7cbf12920af00 overlay88.sbin -de8a847bff8c343d69b853a215e6ee775ef2ef96 overlay89.sbin -84ce4bc9949f697c12ae6598ef74a7e3f60b1531 overlay90.sbin -2c26cf42ca34629dfc7cc491820e2a309e57eeeb overlay91.sbin -87c3ffad8da5d31174a542832d80bf1855c3225c overlay92.sbin -dabd69f841fce75c91c4236925757150990af289 overlay93.sbin -d647dfde4cd10a41e590114f2538442ed8f2ef26 overlay94.sbin -3410ea804433b4a797932d1999fbb2429611ae56 overlay95.sbin -af7de8e345ff25de55130069f313b57e85d72a4f overlay96.sbin -138a69ea796d35f244daa36a7e9962ea2d0322e0 overlay97.sbin -7648d3a8ca287175a5e29aef623156f11c632d98 overlay98.sbin -e93f9eb3382856feb76c8b0ba400b7d2593db5c5 overlay99.sbin -0033be85ba8a9f1eac53e0d97090911298c7de82 overlay100.sbin -31b95069ac95b7e75df9d29ab410dc72c14ea3b5 overlay101.sbin -20e1299cf7365fe4e84445238d3fd3712279b1a3 overlay102.sbin -de8a847bff8c343d69b853a215e6ee775ef2ef96 overlay103.sbin -a3f4dcf6634992ff3367fe5a377825fb913a39f6 overlay104.sbin -0e6e923a1a359b9482646b3dd0a7a2562e140672 overlay105.sbin -c3a66997e55fb3e761d521136a42f07f4761f5da overlay106.sbin -f8d3fd65261098ff45b3a31319c904b520814fa2 overlay107.sbin -901f6afe6c1b0b54dc42af812f13560758814d2b overlay108.sbin -5acaa19b61120f72d546a83e36c361b2e383c0bd overlay109.sbin -1626b234bbd0915fc1bd57d0b67c59c86f1138bd overlay110.sbin -eb9d61aa9d3ad877f55af30ff212ecc7094049c5 overlay111.sbin -535bf2a3127064fc977a45611ff44e0473be597a overlay112.sbin -0d92a7c86aa0582c60730ab45884ce4beed765d8 overlay113.sbin -70f797e7e397da074be5a6fed5e2f79c4907d41c overlay114.sbin -dd0e40ce15f9bc1eccf25bc29f481a1835098c7b overlay115.sbin -248a912b8adc0cb4df962256b8b7b557bbd613af overlay116.sbin -9a00f7bf15c8b90ba46dafe5ec5e924684b1d270 overlay117.sbin -babc139fb62af0f7e4320b62089eaed7b2dfa3bb overlay118.sbin -76b46eb4dd4d8b21665e7a2488cccf060911cc0a overlay119.sbin -637cf7c59d68702453016a1bf2a1c0d101809912 overlay120.sbin -67a01b02f9d9c8135e57bf274c6a75bf0c2c9be2 overlay121.sbin +6b61f25c1542f05dbdab54cf2dfaad9914555d07 *main.sbin +de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay0.sbin +906b5d19e6478a795eda151c771ff3a47fb1a8d5 *overlay1.sbin +de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay2.sbin +de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay3.sbin +2527b3e0bbc7cf76e9125c8215043faf84ef0af2 *overlay4.sbin +0456f78ac3e294722f669c793fc9727b23b66fba *overlay5.sbin +6e5ed74d5bdb94d2ce78d8990c364b4766eab772 *overlay6.sbin +fef29cf33d4dfd1f068a7b67798e7b5950fce749 *overlay7.sbin +9d381061f1a7c6cccb731871aa8e7013848709cd *overlay8.sbin +ba1a20a286990d2d318af29cd6e8dad389d45504 *overlay9.sbin +05ab4e12c01211ce4305bde303e06ce11dda78af *overlay10.sbin +a6dc7a7e32c14081b5db5a0a5e1e5120bebe52a9 *overlay11.sbin +fa28629441497607e072a3aceebfb6d167457020 *overlay12.sbin +8b64b97469bff5dc372b5178baa4676f7b2bcfc2 *overlay13.sbin +d9b09c1e37088d6aaeb73143ecec98ab3327ec67 *overlay14.sbin +de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay15.sbin +b058a62fb8e4d646bb7508f5a21e406591f809c1 *overlay16.sbin +543c0afabc3d90310f1bc8d4902743461dfdc1e5 *overlay17.sbin +111fe69ca18026aa8574b8f79a6b94ef73715267 *overlay18.sbin +d414d37a9b80f1d346666ad9ef5ba635d5ebb552 *overlay19.sbin +7534ad61985affc27e8b121a6645b825ffae48c7 *overlay20.sbin +6dd9a720fe069aedd9107398c16ba93e57769c64 *overlay21.sbin +41ad74512da8c556fc28f8bf41ad77156d3d4cc9 *overlay22.sbin +2e8fcd133e2736d90dae6e23ac9a669cefc1a7c8 *overlay23.sbin +cc4bb361071632627532c48af9a0b37c1751670a *overlay24.sbin +0fbd0432432d42462b9c02f07e30634987708dc6 *overlay25.sbin +44e45c2b6ec6aa74142550f25f770954b8e0d555 *overlay26.sbin +3301af166bc328d4df4412dbf6c740635151867c *overlay27.sbin +98a048c770a311a3fd756ad725997964fdd14aa8 *overlay28.sbin +ca63341e12e782896fc58d5ce6fefa2170b5e921 *overlay29.sbin +d18ad1ad381bb674c840d1a0435ff39c17c5488f *overlay30.sbin +f6c50384fcfc828ccc29aaf89540b7529c981931 *overlay31.sbin +eac8d17d2e5301cd7b2d7ba507f2ecd1df9d59cd *overlay32.sbin +dfab77a2a03414852a047b45eabec7d3367fca58 *overlay33.sbin +cd5d643c3bf17d863db96640d7bfc100bda30b37 *overlay34.sbin +4410caba494af7c853ef7f1a4a2ac4d8243f5a18 *overlay35.sbin +09d6d7c195d109d31c8f890711f562ae2e219cfd *overlay36.sbin +212e5bc9a6036f4c0be02d65bbba5feed12c5d53 *overlay37.sbin +3f15b19c0ca694b9942077a9c8eda0855c25450c *overlay38.sbin +da2f09fdfc788b4a6e6ada88db5176fcdc23c924 *overlay39.sbin +f8a583401a3a614cc88ee6dc7f3b3cdbf00f22cb *overlay40.sbin +a5b13f54d5303140b3169c794db0fd04c9c2dc22 *overlay41.sbin +ba5baba0ff38e940d333dbea89e4c510b6998922 *overlay42.sbin +261b64d5fd09a304a5d7e78a18b44a6ecfe7ec93 *overlay43.sbin +5dd962600f238f162c0999dcb8a134c9df134293 *overlay44.sbin +e722ce81a98e1d78011e179f008a4cac37e20610 *overlay45.sbin +87cd3ac2574737177d399a8cf8a8374c9599e38b *overlay46.sbin +b38da9fe733a6a1213ff217f4e2788e3ae2011a4 *overlay47.sbin +70266035d948ee5a826b06a3a1b908a50af050c9 *overlay48.sbin +489ae29169ae71eb72909fdebdd0aa8bf8ca63f4 *overlay49.sbin +2c6a1fb46550bdb140c677e37ae06779b84e7c3e *overlay50.sbin +13069defd90d47eebe9eb4a48974e82369614fa7 *overlay51.sbin +4963a7d852a9691cdd9382f42c527d0c457fb520 *overlay52.sbin +26f0a9bd0e207a3260cb3a04e268a20b3d2c52d2 *overlay53.sbin +395bbb8597227e687f61cea574c2219c7c77d1d1 *overlay54.sbin +ea68f11d110d5929d18eeaad9cf3f1792986ab7f *overlay55.sbin +1b89fbbf7576f21608df1334606ed2e77f5e21ea *overlay56.sbin +88b06ba661770c8feef9ec96bcee6942819fbda4 *overlay57.sbin +9b7c8c69b165a8a4f1da4ff4fc73bdc0af52def8 *overlay58.sbin +43b9d869fc580cb7e6af6ef95cbbc015b5542d50 *overlay59.sbin +0a0cfedfb93a08ff8fd187d6e62a5c9a1e3056cc *overlay60.sbin +a5f5fb58639672291dc9328f8659fdea0a1329ee *overlay61.sbin +d073752e86af2a435978fed11ce5557c5dc3b3ac *overlay62.sbin +75595fd5704b4ffdce5e32160e35506e166d2122 *overlay63.sbin +d2a6ce95570f7eddb8cbfbe0fd8317d54c48cb1d *overlay64.sbin +974d51ed28bab8005a761ab10f0caf3232ca75b0 *overlay65.sbin +1dd7362a44183422c084958e4356c4c65b23ebbe *overlay66.sbin +3565015a195a71e06e0c56ef638f06116f27e597 *overlay67.sbin +6c90858a9f97833957e94da68513a90b7ea16dfa *overlay68.sbin +c655f6874e4e9897f3f0782af1140cedd97154da *overlay69.sbin +b80c7e652b63a37f2a30b9c0f14d6e5608185d05 *overlay70.sbin +cf86b18a15a2b011fd0e7c98379a9fa228c3fc4c *overlay71.sbin +39a79a31811cac6b1a90206e67624c0a3179bd46 *overlay72.sbin +deecf01a5608b25883804ef30c9d4c3d0c904ee5 *overlay73.sbin +21e3d2a2fb36d739f4fd16792719bf6fa7b7e6aa *overlay74.sbin +88ceed815cb9a2ef6e0d2dcedd2fc126e717c165 *overlay75.sbin +13777fa8b44e026c4eb960cce2309451c4594726 *overlay76.sbin +d7a304050d0049809b21cf75937e4d14aaf858c5 *overlay77.sbin +8571cf57764db093c9ce385586894659297b783e *overlay78.sbin +b8c85f32459d20b3a6cfde5a1e349215dd0157a0 *overlay79.sbin +0ba83af5f2cafb311dbc552d77cb1b6b4f45d34e *overlay80.sbin +1982ed52ba9469dd625dc5951277fd1c001b26af *overlay81.sbin +429a576c3e5a24f25167051957b22f194d2af781 *overlay82.sbin +1904a30bcfb722856130ab7b3d0e79fd0070520d *overlay83.sbin +8bd6a805631e2d661f9d5889e568a72e60f93a04 *overlay84.sbin +c197c9edb988d64dec0a56427dfc6960646dc1f7 *overlay85.sbin +a563e0430b460ee5a39442667561e0bd5428dcdb *overlay86.sbin +8c7f762ebf90f08b09b9efd49946176bb6ed1c69 *overlay87.sbin +ca9016bf18dc6efc3490bfb893f7cbf12920af00 *overlay88.sbin +de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay89.sbin +84ce4bc9949f697c12ae6598ef74a7e3f60b1531 *overlay90.sbin +2c26cf42ca34629dfc7cc491820e2a309e57eeeb *overlay91.sbin +87c3ffad8da5d31174a542832d80bf1855c3225c *overlay92.sbin +dabd69f841fce75c91c4236925757150990af289 *overlay93.sbin +d647dfde4cd10a41e590114f2538442ed8f2ef26 *overlay94.sbin +3410ea804433b4a797932d1999fbb2429611ae56 *overlay95.sbin +af7de8e345ff25de55130069f313b57e85d72a4f *overlay96.sbin +138a69ea796d35f244daa36a7e9962ea2d0322e0 *overlay97.sbin +7648d3a8ca287175a5e29aef623156f11c632d98 *overlay98.sbin +e93f9eb3382856feb76c8b0ba400b7d2593db5c5 *overlay99.sbin +0033be85ba8a9f1eac53e0d97090911298c7de82 *overlay100.sbin +31b95069ac95b7e75df9d29ab410dc72c14ea3b5 *overlay101.sbin +20e1299cf7365fe4e84445238d3fd3712279b1a3 *overlay102.sbin +de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay103.sbin +a3f4dcf6634992ff3367fe5a377825fb913a39f6 *overlay104.sbin +0e6e923a1a359b9482646b3dd0a7a2562e140672 *overlay105.sbin +c3a66997e55fb3e761d521136a42f07f4761f5da *overlay106.sbin +f8d3fd65261098ff45b3a31319c904b520814fa2 *overlay107.sbin +901f6afe6c1b0b54dc42af812f13560758814d2b *overlay108.sbin +5acaa19b61120f72d546a83e36c361b2e383c0bd *overlay109.sbin +1626b234bbd0915fc1bd57d0b67c59c86f1138bd *overlay110.sbin +eb9d61aa9d3ad877f55af30ff212ecc7094049c5 *overlay111.sbin +535bf2a3127064fc977a45611ff44e0473be597a *overlay112.sbin +0d92a7c86aa0582c60730ab45884ce4beed765d8 *overlay113.sbin +70f797e7e397da074be5a6fed5e2f79c4907d41c *overlay114.sbin +dd0e40ce15f9bc1eccf25bc29f481a1835098c7b *overlay115.sbin +248a912b8adc0cb4df962256b8b7b557bbd613af *overlay116.sbin +9a00f7bf15c8b90ba46dafe5ec5e924684b1d270 *overlay117.sbin +babc139fb62af0f7e4320b62089eaed7b2dfa3bb *overlay118.sbin +76b46eb4dd4d8b21665e7a2488cccf060911cc0a *overlay119.sbin +637cf7c59d68702453016a1bf2a1c0d101809912 *overlay120.sbin +67a01b02f9d9c8135e57bf274c6a75bf0c2c9be2 *overlay121.sbin diff --git a/tools/csv2bin/meson.build b/tools/csv2bin/meson.build index 0f5f39bb82..3b23fd22df 100644 --- a/tools/csv2bin/meson.build +++ b/tools/csv2bin/meson.build @@ -5,6 +5,9 @@ csv2bin_exe = executable('csv2bin', 'Manifest.cpp', 'Options.cpp' ], - cpp_args: '-DNDEBUG', + cpp_args: [ + '-DNDEBUG', + '-std=c++17' + ], native: true -) \ No newline at end of file +) diff --git a/tools/knarc/meson.build b/tools/knarc/meson.build index e92fb089ce..c1d55c00ef 100644 --- a/tools/knarc/meson.build +++ b/tools/knarc/meson.build @@ -10,10 +10,10 @@ cpp_scrs = [ ] knarc_exe = executable('knarc', - cpp_args: '-std=c++17', sources: [ c_srcs, cpp_scrs ], + cpp_args: '-std=c++17', native: true -) \ No newline at end of file +) diff --git a/tools/msgenc/meson.build b/tools/msgenc/meson.build index 6c2d9ee206..88d9ac349d 100644 --- a/tools/msgenc/meson.build +++ b/tools/msgenc/meson.build @@ -10,6 +10,9 @@ msgenc_exe = executable('msgenc', 'Gmm.cpp', 'pugixml.cpp' ], - cpp_args: '-DNDEBUG', + cpp_args: [ + '-DNDEBUG', + '-std=c++17' + ], native: true -) \ No newline at end of file +)