mirror of
https://github.com/Ponce/slackbuilds
synced 2024-09-29 17:37:55 +02:00
libraries/ogre: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
82e4103f4e
commit
52dc75ef22
2 changed files with 9 additions and 6 deletions
|
@ -29,11 +29,16 @@
|
|||
# ogre. This allows ogre to be built on a system where assimp is
|
||||
# installed.
|
||||
|
||||
# 20220214 bkw: Modified by SlackBuilds.org again: ogre-13.2.4 really
|
||||
# wants imgui-1.85 (not 1.86; it was failing to build with that). Also,
|
||||
# we can use assimp now, so get rid of -DOGRE_BUILD_PLUGIN_ASSIMP=FALSE.
|
||||
# It will be autodetected, the build will succeed with or without it.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PRGNAM=ogre
|
||||
VERSION=${VERSION:-13.2.4}
|
||||
IMGUIVER=${IMGUIVER:-1.86}
|
||||
IMGUIVER=${IMGUIVER:-1.85}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
PKGTYPE=${PKGTYPE:-tgz}
|
||||
|
@ -94,8 +99,7 @@ find -L . \
|
|||
|
||||
mkdir build
|
||||
cd build
|
||||
tar xvf $CWD/imgui-$IMGUIVER.tar.gz
|
||||
export "PATH=/opt/cmake-202x/bin:$PATH"
|
||||
tar xvf $CWD/imgui-$IMGUIVER.tar.gz
|
||||
CXXFLAGS+=' -Wno-deprecated-declarations' \
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
|
@ -106,7 +110,6 @@ tar xvf $CWD/imgui-$IMGUIVER.tar.gz
|
|||
-DOGRE_BUILD_DEPENDENCIES=FALSE \
|
||||
-DOGRE_BUILD_PLUGIN_FREEIMAGE=TRUE \
|
||||
-DOGRE_INSTALL_SAMPLES_SOURCE=$OGRE_INSTALL_SAMPLES_SOURCE \
|
||||
-DOGRE_BUILD_PLUGIN_ASSIMP=FALSE \
|
||||
-DOGRE_BUILD_COMPONENT_CSHARP=FALSE \
|
||||
../
|
||||
make
|
||||
|
|
|
@ -2,9 +2,9 @@ PRGNAM="ogre"
|
|||
VERSION="13.2.4"
|
||||
HOMEPAGE="https://www.ogre3d.org/"
|
||||
DOWNLOAD="https://github.com/OGRECave/ogre/archive/v13.2.4/ogre-13.2.4.zip \
|
||||
https://github.com/ocornut/imgui/archive/v1.86/imgui-1.86.tar.gz"
|
||||
https://github.com/ocornut/imgui/archive/v1.85/imgui-1.85.tar.gz"
|
||||
MD5SUM="b540b3feaebe530370c659013c144d23 \
|
||||
82f6ab3267c1831223f6ae03c58baccc"
|
||||
bb710a24164a8dd54369bc4282d9d3b9"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="pugixml"
|
||||
|
|
Loading…
Reference in a new issue