Skip to content

Commit 7251ad9

Browse files
committed
Fix building on rpi.
1 parent 54c2f42 commit 7251ad9

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

scriptmodules/ports/rbdoom3_bfg.sh

100644100755
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ function build_rbdoom3_bfg() {
4848
cd $md_build/build
4949

5050
if isPlatform "rpi"; then
51-
# NOTE: I am guessing on DCPU_TYPE for 32bit and 64bit.
51+
# DCPU_TYPE is the only value to change: armhf for 32bit and aarch64 for 64bit Is there a
52+
# variable that responds with those two values and only those values? Might be a way to simplify this.
53+
# NOTE: I am guessing on DCPU_TYPE for 64bit
5254
if isPlatform "64bit"; then
5355
# This is a 64-bit rpi build
56+
# NOTE: This is from the rasbian rules file. I have no idea what DEB_HOST_MULTIARCH
57+
# returns. Since this isn't being cross-compiled, I hope it doesn't matter.
58+
#-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
59+
5460
cmake -G "Unix Makefiles" \
5561
-DSDL2=ON \
56-
# NOTE: This is from the rasbian rules file. I have no idea what DEB_HOST_MULTIARCH
57-
# returns. Since this isn't being cross-compiled, I hope it doesn't matter.
58-
#-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
5962
-DUSE_SYSTEM_ZLIB=ON \
6063
-DUSE_SYSTEM_LIBPNG=ON \
6164
-DUSE_SYSTEM_LIBJPEG=ON \
@@ -69,11 +72,12 @@ function build_rbdoom3_bfg() {
6972
../neo
7073
else
7174
# This is a 32-bit rpi build
75+
# NOTE: This is from the rasbian rules file. I have no idea what DEB_HOST_MULTIARCH
76+
# returns. Since this isn't being cross-compiled, I hope it doesn't matter.
77+
#-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
78+
7279
cmake -G "Unix Makefiles" \
7380
-DSDL2=ON \
74-
# NOTE: This is from the rasbian rules file. I have no idea what DEB_HOST_MULTIARCH
75-
# returns. Since this isn't being cross-compiled, I hope it doesn't matter.
76-
#-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
7781
-DUSE_SYSTEM_ZLIB=ON \
7882
-DUSE_SYSTEM_LIBPNG=ON \
7983
-DUSE_SYSTEM_LIBJPEG=ON \

0 commit comments

Comments
 (0)