Fixes beim linken
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5685 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
b17ee32542
commit
c35cfb1cfb
@ -101,6 +101,12 @@ mk32() {
|
|||||||
for i in build.make link.txt relink.txt; do
|
for i in build.make link.txt relink.txt; do
|
||||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||||
done
|
done
|
||||||
|
for i in ksudoku/src/CMakeFiles/ksudoku.dir/link.txt \
|
||||||
|
kubrick/src/CMakeFiles/kubrick.dir/link.txt \
|
||||||
|
kubrick/src/CMakeFiles/kubrick.dir/relink.txt \
|
||||||
|
ksudoku/src/CMakeFiles/ksudoku.dir/relink.txt; do
|
||||||
|
sed -i "s%$% -L/usr/X11R7/lib -lGLU%" $i
|
||||||
|
done
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||||
make DESTDIR=$TMPROOT install
|
make DESTDIR=$TMPROOT install
|
||||||
@ -132,6 +138,12 @@ mk() {
|
|||||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||||
.. &&
|
.. &&
|
||||||
|
for i in ksudoku/src/CMakeFiles/ksudoku.dir/link.txt \
|
||||||
|
kubrick/src/CMakeFiles/kubrick.dir/link.txt \
|
||||||
|
kubrick/src/CMakeFiles/kubrick.dir/relink.txt \
|
||||||
|
ksudoku/src/CMakeFiles/ksudoku.dir/relink.txt; do
|
||||||
|
sed -i "s%$% -L/usr/X11R7/$LIBDIR -lGLU%" $i
|
||||||
|
done
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make DESTDIR=$TMPROOT install
|
make DESTDIR=$TMPROOT install
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user