Fix suggestions and bugs spotted by zlin

https://galileo.mailstation.de/gerrit/#/c/5864/
This commit is contained in:
2016-05-13 22:41:29 +02:00
parent 8b1c24e748
commit 22a67e22f1
32 changed files with 54 additions and 75 deletions

View File

@@ -10,7 +10,7 @@ LICENCES="DUKE3D GOG-EULA"
SLOT="0"
PLATFORMS="amd64 hppa ppc x86"
MYOPTIONS=""
RESTRICT="mirror bindist fetch"
RESTRICT="fetch"
DEPENDENCIES="
build:

View File

@@ -43,7 +43,12 @@ MYOPTIONS="
tools [[ description = [ Build several tools for modding and
development ] ]]
vpx [[ description = [ Enable support for WebM VP8 Codecs ] ]]
( opl-musicpack sc55-musicpack ) [[ number-selected = at-most-one ]]
(
opl-musicpack [[ description = [ Include optional OPL (AdLib)
music pack ] ]]
sc55-musicpack [[ description = [ Include optional Roland SC-55
music pack ] ]]
) [[ number-selected = at-most-one ]]
"
DEPENDENCIES="

View File

@@ -46,8 +46,6 @@ src_prepare() {
}
src_compile() {
export CC=${CC} CXX=${CXX} LD=${LD} AR=${AR} RANLIB=${RANLIB}
emake -C ${MY_S} \
V=1 \
DEFAULT_BASEDIR="${OA_SHARE_DIR}" \

View File

@@ -65,7 +65,7 @@ src_unpack() {
}
src_compile() {
env -u TARGETS -u PLATFORM emake \
edo env -u TARGETS -u PLATFORM emake \
ARCH=$(option platform:amd64 "x86_64" "i386") \
PLATFORM=linux \
DEFAULT_BASEDIR="/usr/share/${PN}" \

View File

@@ -68,8 +68,6 @@ src_prepare() {
src_compile() {
local i
export CC=${CC} CXX=${CXX} LD=${LD} AR=${AR} RANLIB=${RANLIB}
# fixes parallel build issues
for i in sv-release cl-release sdl-release ; do
emake \