summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-21 14:04:52 -0500
committerRobby Workman <rworkman@slackbuilds.org>2022-02-21 14:34:28 -0600
commitb48334c555a8c5ec5082efadb62c41e59b8236a6 (patch)
tree24ad2204a2e0fb006845fa0f652111ea766854ea /games
parent04fd195fb5728f5b72bc8c3f0ba335ff84bf4210 (diff)
downloadslackbuilds-b48334c555a8c5ec5082efadb62c41e59b8236a6.tar.gz
games/vbam: Fix wxPython vs. wxGTK3 mess. Again.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'games')
-rw-r--r--games/vbam/vbam.SlackBuild9
1 files changed, 7 insertions, 2 deletions
diff --git a/games/vbam/vbam.SlackBuild b/games/vbam/vbam.SlackBuild
index 205511dbf3..5784c77ed7 100644
--- a/games/vbam/vbam.SlackBuild
+++ b/games/vbam/vbam.SlackBuild
@@ -120,9 +120,14 @@ WXCONF=${WXCONF:-/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0}
# 20211117 bkw: upstream doesn't autodetect wx, we have to explicitly
# set it to ON or OFF.
+# 20220221 bkw: this had to be fixed again, it started failing when
+# /usr/bin/wx-config was the wxPython one.
WXDEF="-DENABLE_WX=OFF"
-if [ "${WX:-yes}" = "yes" ]; then
- [ -x "$WXCONF" ] && WXDEF="-DENABLE_WX=OFF -DwxWidgets_CONFIG_EXECUTABLE=$WXCONF"
+if [ "${WX:-yes}" = "yes" -a -x "$WXCONF" ]; then
+ WXDEF="-DENABLE_WX=ON"
+ mkdir wxtmp
+ ln -s $WXCONF wxtmp/wx-config
+ export PATH=$(pwd)/wxtmp:$PATH
fi
# 20211117 bkw: lirc doesn't autodetect.