Skip to content

Commit 2aaac62

Browse files
author
R. van Elst
committed
OS X: build flags to fix compilation with appleclang and a change to the test for a tr error message
1 parent f92248b commit 2aaac62

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/build-test-and-artifact.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,15 @@ jobs:
167167
run: cmake -E make_directory ${{runner.workspace}}/build
168168

169169
- name: Install dependencies
170-
run: brew install sdl2 libpcap libx11
170+
run: brew install coreutils libpcap netcat # sdl2 libx11
171+
172+
- name: gnu tr
173+
run: sudo mv /usr/local/opt/coreutils/libexec/gnubin/tr /usr/bin/tr
171174

172175
- name: Configure CMake
173176
shell: bash
174177
working-directory: ${{runner.workspace}}/build
175-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Wall"
178+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Wall -Wc++11-extensions -Wc++11-long-long -Wc++11-extra-semi -std=c++11 -stdlib=libc++ -I/usr/local/opt/libpcap/include"
176179

177180
- name: Build
178181
working-directory: ${{runner.workspace}}/build

test/rom/test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
export LC_CTYPE=C
3+
export LANG=C
4+
export LC_ALL=C
25

36
# Download the firmware
47
wget 'http://raymii.org/s/inc/downloads/es40-srmon/cl67srmrom.exe'

0 commit comments

Comments
 (0)