Added $secondaryArchSuffix, using g++, updated to newest cdplayer commit,

use OBJ_DIR parameter of make.
Thanks waddlesplash for the hints.
This commit is contained in:
Humdinger
2014-07-10 17:36:12 +02:00
parent 16fc8a1ad2
commit c3eef8b351

View File

@@ -10,7 +10,7 @@ In that case you're better off mounting the CD in Tracker and use \
MediaPlayer to play back the audio files in its wav folder.
"
HOMEPAGE="https://github.com/HaikuArchives/CDPlayer"
SRC_URI="git://github.com/HaikuArchives/CDPlayer#015f84c84f495fd6d635b8646be54eb2f13579c5"
SRC_URI="git://github.com/HaikuArchives/CDPlayer#f7e839c39669be0f5119941eda30231be522ad97"
LICENSE="Be Sample Code License
MIT"
COPYRIGHT="1992-2000, Be Incorporated
@@ -18,22 +18,24 @@ COPYRIGHT="1992-2000, Be Incorporated
"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
CDPlayer = $portVersion
app:CDPlayer = $portVersion
CDPlayer$secondaryArchSuffix = $portVersion
app:CDPlayer$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
makefile_engine
cmd:gcc
cmd:g++$secondaryArchSuffix
cmd:make
cmd:mkdepend
"
@@ -41,13 +43,12 @@ BUILD_PREREQUIRES="
BUILD()
{
cd src
make $jobArgs
make $jobArgs OBJ_DIR=objects
}
INSTALL()
{
mkdir -p $appsDir
ARCH=$(echo $buildArchitecture | sed 's/_/-/g')
cp -af src/objects.$ARCH-release/CDPlayer $appsDir
cp -af src/objects/CDPlayer $appsDir
addAppDeskbarSymlink $appsDir/CDPlayer
}