summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2020-09-06 21:37:12 +0200
committer Willy Sudiarto Raharjo2020-09-12 18:45:06 +0200
commit625dcba314c505e774e08c43c327e09f4eb079e6 (patch)
tree31a61f11ba62528e37ef143cb6903198aa49caad
parenta46f997ee71ecbd50e98cf5d6be686a4321159c5 (diff)
downloadslackbuilds-625dcba314c505e774e08c43c327e09f4eb079e6.tar.gz
games/glestae: Fix build when wxGTK3 installed.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/glestae/glestae.SlackBuild6
1 files changed, 5 insertions, 1 deletions
diff --git a/games/glestae/glestae.SlackBuild b/games/glestae/glestae.SlackBuild
index 21cf3b7933..3687ec0899 100644
--- a/games/glestae/glestae.SlackBuild
+++ b/games/glestae/glestae.SlackBuild
@@ -22,9 +22,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20200906 bkw: modified by SlackBuilds.org: the build was failing if
+# wxGTK3 was installed, due to the /usr/bin/wx-config conflict.
+
PRGNAM=glestae
VERSION=${VERSION:-0.3.93}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -77,6 +80,7 @@ patch -p1 < $CWD/gcc-4.7.patch
mkdir -p build
cd build
cmake -G "Unix Makefiles" \
+ -DwxWidgets_CONFIG_OPTIONS="--version=2.8" \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \