Diverse Updates aus Apps.dmk
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6157 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
2bc7cb12f2
commit
8634b80162
@ -82,6 +82,7 @@ mk32() {
|
|||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=32 \
|
USE_ARCH=32 \
|
||||||
./configure --build=$TARGET32 \
|
./configure --build=$TARGET32 \
|
||||||
|
--enable-introspection=no \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU install
|
make -j $NUMCPU install
|
||||||
@ -90,13 +91,11 @@ mk32() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure $ADDOPTIONS \
|
./configure --libdir=\${prefix}/${LIBDIR} \
|
||||||
|
--enable-introspection=no \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU install
|
make -j $NUMCPU install
|
||||||
|
@ -74,11 +74,11 @@
|
|||||||
SRCPATH=GuiBased/Lib
|
SRCPATH=GuiBased/Lib
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
echo "Nothing to do for premk()"
|
dot -c
|
||||||
}
|
}
|
||||||
|
|
||||||
mk32() {
|
mk32() {
|
||||||
USE_ARCH=32 pango-querymodules >/usr/X11R7/etc/pango-32/pango.modules
|
USE_ARCH=32 pango-querymodules >/etc/pango-32/pango.modules
|
||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=32 \
|
USE_ARCH=32 \
|
||||||
@ -91,15 +91,14 @@ mk32() {
|
|||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
USE_ARCH=$UARCH pango-querymodules >/etc/pango-$UARCH/pango.modules
|
||||||
USE_ARCH=$UARCH pango-querymodules >/usr/X11R7/etc/pango-$UARCH/pango.modules
|
|
||||||
else
|
else
|
||||||
pango-querymodules >/usr/X11R7/etc/pango/pango.modules
|
pango-querymodules >/etc/pango/pango.modules
|
||||||
fi
|
fi
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure $ADDOPTIONS \
|
./configure --libdir=\${prefix}/${LIBDIR} \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
@ -84,7 +84,7 @@ mk32() {
|
|||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
USE_ARCH=32 \
|
USE_ARCH=32 \
|
||||||
./configure --prefix=/usr/X11R7 \
|
./configure --prefix=/usr/X11R7 \
|
||||||
--sysconfdir=/etc/sysconfig \
|
--sysconfdir=/etc \
|
||||||
--datadir=/usr/share \
|
--datadir=/usr/share \
|
||||||
--build=$TARGET32
|
--build=$TARGET32
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
@ -94,15 +94,12 @@ mk32() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure --prefix=/usr/X11R7 \
|
./configure --prefix=/usr/X11R7 \
|
||||||
--sysconfdir=/etc/sysconfig \
|
--sysconfdir=/etc \
|
||||||
$ADDOPTIONS \
|
--libdir=\${prefix}/${LIBDIR} \
|
||||||
--datadir=/usr/share
|
--datadir=/usr/share
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
@ -80,13 +80,10 @@ premk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure $ADDOPTIONS \
|
./configure --libdir=\${prefix}/${LIBDIR} \
|
||||||
--prefix=/usr/X11R7
|
--prefix=/usr/X11R7
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
@ -96,7 +96,7 @@ mk() {
|
|||||||
-DX11_LIBRARY=/usr/X11R7/$LIBDIR \
|
-DX11_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||||
-DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \
|
-DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||||
-DMYSQL_INCLUDE_DIR=/opt/MySQL/include/mysql \
|
-DMYSQL_INCLUDE_DIR=/opt/MySQL/include/mysql \
|
||||||
-DMYSQL_LIBRARIES=/opt/MySQL/$LIBDIR/mysql/libmysqlclient.so \
|
-DMYSQL_LIBRARIES=/opt/MySQL/$LIBDIR/libmysqlclient.so \
|
||||||
-DOPENGL_INCLUDE_DIR=/usr/include/GL \
|
-DOPENGL_INCLUDE_DIR=/usr/include/GL \
|
||||||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||||
|
@ -87,7 +87,7 @@ mk() {
|
|||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \
|
LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \
|
||||||
./configure --prefix=/usr/X11R7 \
|
./configure --prefix=/usr/X11R7 \
|
||||||
$ADDOPTIONS \
|
--libdir=/usr/X11R7/${LIBDIR} \
|
||||||
--confdir=/etc/sysconfig/mplayer \
|
--confdir=/etc/sysconfig/mplayer \
|
||||||
--enable-radio \
|
--enable-radio \
|
||||||
--enable-radio-capture \
|
--enable-radio-capture \
|
||||||
@ -97,11 +97,8 @@ mk() {
|
|||||||
--with-vidix-drivers=cyberblade,ivtv,mach64,mga,mga_crtc2,nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome \
|
--with-vidix-drivers=cyberblade,ivtv,mach64,mga,mga_crtc2,nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome \
|
||||||
--enable-gl \
|
--enable-gl \
|
||||||
--enable-runtime-cpudetection
|
--enable-runtime-cpudetection
|
||||||
#if [ "$MK64BIT" == "true" ]; then
|
sed -i "s/\(EXTRALIBS *=.*$\)/\1 -lfribidi/" config.mak
|
||||||
#sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\164\2 -lfribidi/" config.mak
|
sed -i "s/\(EXTRALIBS_MPLAYER.*$\)/\1 -lfribidi/" config.mak
|
||||||
#else
|
|
||||||
#sed -i "s/\(EXTRALIBS.*\)\(\/libxmms.so.1\)/\1\2 -lfribidi/" config.mak
|
|
||||||
#fi
|
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make CFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \
|
make CFLAGS="-L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \
|
||||||
DESTDIR=$TMPROOT install
|
DESTDIR=$TMPROOT install
|
||||||
|
Loading…
Reference in New Issue
Block a user