From fc9e3d92cf62dd30ff9709abe6b5711f839f4110 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 14:19:30 +0900 Subject: qt -> tqt conversion: qtlib -> tqtlib libqt -> libtqt QTLIB -> TQTLIB LIBQT -> LIBTQT Signed-off-by: Michele Calgaro --- doc/INSTALL-MacOS.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'doc/INSTALL-MacOS.txt') diff --git a/doc/INSTALL-MacOS.txt b/doc/INSTALL-MacOS.txt index e0733aeb..3380923e 100644 --- a/doc/INSTALL-MacOS.txt +++ b/doc/INSTALL-MacOS.txt @@ -102,9 +102,9 @@ Feel free to remove --enable-debug if you don't want to have a debuggable build 3) Run make -CAUTION!!! Because of a problem with libtool you have to remove or rename the file libqt-mt.la (or libqt.la if you compiled QT without threads). It is located in $QTDIR/lib/. Otherwise the compilation will stop with a link error. +CAUTION!!! Because of a problem with libtool you have to remove or rename the file libtqt-mt.la (or libtqt.la if you compiled QT without threads). It is located in $QTDIR/lib/. Otherwise the compilation will stop with a link error. -# mv $QTDIR/lib/libqt-mt.la $QTDIR/lib/libqt-mt.la.bak +# mv $QTDIR/lib/libtqt-mt.la $QTDIR/lib/libtqt-mt.la.bak Now run make and relax :-) @@ -120,7 +120,7 @@ Now run make and relax :-) 5) Relinking -KVirc and its modules depend on libkvilib and libqt which are not in the dynamic linker search path by default. The paths set during the compilation are absolute paths and have to be changed to be realtive to the executable path. +KVirc and its modules depend on libkvilib and libtqt which are not in the dynamic linker search path by default. The paths set during the compilation are absolute paths and have to be changed to be realtive to the executable path. The following commands do this for libkvilib: @@ -128,29 +128,29 @@ The following commands do this for libkvilib: # install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib @executable_path/../Frameworks/libkvilib.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc # find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib @executable_path/../Frameworks/libkvilib.3.dylib -Now you have to decide whether you want to include libqt within the bundle or not. This is useful if you consider to share your bundle with your friends and they don't want to compile QT themselves. +Now you have to decide whether you want to include libtqt within the bundle or not. This is useful if you consider to share your bundle with your friends and they don't want to compile QT themselves. -a) You don't want to include libqt within the bundle +a) You don't want to include libtqt within the bundle -Make sure the dynamic linker is able to find libqt. The easiest way is to make symlinks in the /usr/lib directory. +Make sure the dynamic linker is able to find libtqt. The easiest way is to make symlinks in the /usr/lib directory. -# ln -sf $QTDIR/lib/libqt-mt.3.dylib /usr/lib +# ln -sf $QTDIR/lib/libtqt-mt.3.dylib /usr/lib # ln -sf $QTDIR/lib/libqui.1.dylib /usr/lib -b) You want to include libqt within the bundle +b) You want to include libtqt within the bundle -Copy libqt into the bundle: +Copy libtqt into the bundle: -# cp $QTDIR/lib/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/ +# cp $QTDIR/lib/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/ -Relinking commands for libqt: +Relinking commands for libtqt: -# install_name_tool -id @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libqt-mt.3.dylib -# install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc -# install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib -# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib +# install_name_tool -id @executable_path/../Frameworks/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libtqt-mt.3.dylib +# install_name_tool -change libtqt-mt.3.dylib @executable_path/../Frameworks/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc +# install_name_tool -change libtqt-mt.3.dylib @executable_path/../Frameworks/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib +# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change libtqt-mt.3.dylib @executable_path/../Frameworks/libtqt-mt.3.dylib 6) Cleaning up -- cgit v1.2.1