Xscreensaver wird jetzt auch erkannt und mit eingebunden
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5688 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
3b4d48b5ae
commit
5047079ae1
@ -74,7 +74,7 @@ SRCPATH=WindowManager/KDE
|
|||||||
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
|
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
|
||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
echo "Nothing do do for premk()"
|
find . -type f -exec sed -i "s/X11R6/X11R7/" {} \;
|
||||||
}
|
}
|
||||||
|
|
||||||
mk32() {
|
mk32() {
|
||||||
@ -96,6 +96,7 @@ mk32() {
|
|||||||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||||
|
-DXSCREENSAVER_CONFIG_DECO=/usr/X11R7/share/xscreensaver \
|
||||||
-DLIB_SUFFIX= \
|
-DLIB_SUFFIX= \
|
||||||
.. &&
|
.. &&
|
||||||
for i in build.make link.txt relink.txt; do
|
for i in build.make link.txt relink.txt; do
|
||||||
@ -108,12 +109,18 @@ mk32() {
|
|||||||
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/link.txt \
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/link.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/link.txt \
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/link.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/link.txt \
|
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/link.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/link.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/link.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/link.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/klorenz.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/klorenz.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/ksolarwinds.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/ksolarwinds.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/keuphoria.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/keuphoria.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kflux.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/kflux.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/relink.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/relink.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/relink.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/relink.txt; do
|
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/relink.txt; do
|
||||||
sed -i "s%$% -L/usr/X11R7/lib -lGLU%" $i
|
sed -i "s%$% -L/usr/X11R7/lib -lGLU%" $i
|
||||||
done
|
done
|
||||||
@ -146,6 +153,7 @@ mk() {
|
|||||||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||||
|
-DXSCREENSAVER_CONFIG_DECO=/usr/X11R7/share/xscreensaver \
|
||||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||||
.. &&
|
.. &&
|
||||||
for i in kscreensaver/kdesavers/CMakeFiles/klorenz.kss.dir/link.txt \
|
for i in kscreensaver/kdesavers/CMakeFiles/klorenz.kss.dir/link.txt \
|
||||||
@ -155,12 +163,16 @@ mk() {
|
|||||||
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/link.txt \
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/link.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/link.txt \
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/link.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/link.txt \
|
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/link.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/link.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/link.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/klorenz.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/klorenz.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/ksolarwinds.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/ksolarwinds.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/keuphoria.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/keuphoria.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kflux.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/kflux.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/relink.txt \
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/relink.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kfountain.kss.dir/relink.txt \
|
||||||
|
kscreensaver/kdesavers/CMakeFiles/kgravity.kss.dir/relink.txt \
|
||||||
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/relink.txt; do
|
kscreensaver/kdesavers/CMakeFiles/kwave.kss.dir/relink.txt; do
|
||||||
sed -i "s%$% -L/usr/X11R7/$LIBDIR -lGLU%" $i
|
sed -i "s%$% -L/usr/X11R7/$LIBDIR -lGLU%" $i
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user