sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing a lot of Mac issues with the current Qt release.

Browse Source
This commit is contained in:
lotodore
2010-07-08 17:03:43 +00:00
parent 51126fad7c
commit f761f3d63f
1 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac_post_make.sh
+44 -10
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Author: Erhard List (dunkanx@pokerth.net) Version: 1.0 # Author: Lothar May (originally from Erhard List)
# ATTENTION: this is for MAC only! # ATTENTION: this is for MAC only!
# #
@@ -24,8 +24,9 @@ cp -R ./data $RESOURCES
# create framework-path # create framework-path
BINARY_FW_PATH="$APPLICATION/Contents/Frameworks" BINARY_FW_PATH="$APPLICATION/Contents/Frameworks"
mkdir $BINARY_FW_PATH mkdir $BINARY_FW_PATH
BINARY_PLUGIN_PATH="$APPLICATION/Contents/plugins/imageformats" BINARY_PLUGIN_PATH="$APPLICATION/Contents/plugins"
mkdir -p $BINARY_PLUGIN_PATH mkdir -p $BINARY_PLUGIN_PATH/imageformats
mkdir -p $BINARY_PLUGIN_PATH/sqldrivers
# integrate SDL-frameworks into binary # integrate SDL-frameworks into binary
cp -R $SDL_FW_PATH/SDL.framework $BINARY_FW_PATH cp -R $SDL_FW_PATH/SDL.framework $BINARY_FW_PATH
@@ -34,25 +35,58 @@ cp -R $SDL_FW_PATH/SDL_mixer.framework $BINARY_FW_PATH
# integrate Qt-frameworks into binary # integrate Qt-frameworks into binary
if [ "$1" != "--without-qt" ] ; then if [ "$1" != "--without-qt" ] ; then
cp $QT_PLUGIN_PATH/imageformats/libqgif.dylib $BINARY_PLUGIN_PATH cp $QT_PLUGIN_PATH/imageformats/libqgif.dylib $BINARY_PLUGIN_PATH/imageformats
cp $QT_PLUGIN_PATH/imageformats/libqjpeg.dylib $BINARY_PLUGIN_PATH cp $QT_PLUGIN_PATH/imageformats/libqjpeg.dylib $BINARY_PLUGIN_PATH/imageformats
cp $QT_PLUGIN_PATH/sqldrivers/libqsqlite.dylib $BINARY_PLUGIN_PATH/sqldrivers
cp -R $QT_FW_PATH/QtCore.framework $BINARY_FW_PATH cp -R $QT_FW_PATH/QtCore.framework $BINARY_FW_PATH
cp -R $QT_FW_PATH/QtGui.framework $BINARY_FW_PATH cp -R $QT_FW_PATH/QtGui.framework $BINARY_FW_PATH
cp -R $QT_FW_PATH/QtSql.framework $BINARY_FW_PATH
cp -R $QT_FW_PATH/QtNetwork.framework $BINARY_FW_PATH
# remove debug versions
rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug
rm -rf $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug.dSYM
rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/QtCore_debug.prl
rm -f $APPLICATION/Contents/Frameworks/QtCore.framework/Versions/4/QtCore_debug
rm -f $APPLICATION/Contents/Frameworks/QtGui.framework/QtGui_debug
rm -rf $APPLICATION/Contents/Frameworks/QtGui.framework/QtGui_debug.dSYM
rm -f $APPLICATION/Contents/Frameworks/QtGui.framework/QtGui_debug.prl
rm -f $APPLICATION/Contents/Frameworks/QtGui.framework/Versions/4/QtGui_debug
rm -f $APPLICATION/Contents/Frameworks/QtSql.framework/QtSql_debug
rm -rf $APPLICATION/Contents/Frameworks/QtSql.framework/QtSql_debug.dSYM
rm -f $APPLICATION/Contents/Frameworks/QtSql.framework/QtSql_debug.prl
rm -f $APPLICATION/Contents/Frameworks/QtSql.framework/Versions/4/QtSql_debug
rm -f $APPLICATION/Contents/Frameworks/QtNetwork.framework/QtNetwork_debug
rm -rf $APPLICATION/Contents/Frameworks/QtNetwork.framework/QtNetwork_debug.dSYM
rm -f $APPLICATION/Contents/Frameworks/QtNetwork.framework/QtNetwork_debug.prl
rm -f $APPLICATION/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork_debug
# redirect binary to use integrated frameworks # redirect binary to use integrated frameworks
QTCORE="QtCore.framework/Versions/4.0/QtCore" QTCORE="QtCore.framework/Versions/4.0/QtCore"
QTGUI="QtGui.framework/Versions/4.0/QtGui" QTGUI="QtGui.framework/Versions/4.0/QtGui"
QTSQL="QtSql.framework/Versions/4.0/QtSql"
QTNETWORK="QtNetwork.framework/Versions/4.0/QtNetwork"
install_name_tool -id @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTCORE install_name_tool -id @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTCORE
install_name_tool -id @executable_path/../Frameworks/$QTGUI $BINARY_FW_PATH/$QTGUI install_name_tool -id @executable_path/../Frameworks/$QTGUI $BINARY_FW_PATH/$QTGUI
install_name_tool -id @executable_path/../Frameworks/$QTSQL $BINARY_FW_PATH/$QTSQL
install_name_tool -id @executable_path/../Frameworks/$QTSQL $BINARY_FW_PATH/$QTNETWORK
QTCORE_LINK=$(otool -L $BINARY | grep QtCore | cut -d"(" -f1 | cut -f2) QTCORE_LINK=$(otool -L $BINARY | grep QtCore | cut -d"(" -f1 | cut -f2)
QTGUI_LINK=$(otool -L $BINARY | grep QtGui | cut -d"(" -f1 | cut -f2) QTGUI_LINK=$(otool -L $BINARY | grep QtGui | cut -d"(" -f1 | cut -f2)
QTSQL_LINK=$(otool -L $BINARY | grep QtSql | cut -d"(" -f1 | cut -f2)
QTNETWORK_LINK=$(otool -L $BINARY | grep QtNetwork | cut -d"(" -f1 | cut -f2)
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY
install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/libqgif.dylib install_name_tool -change $QTSQL_LINK @executable_path/../Frameworks/$QTSQL $BINARY
install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY_PLUGIN_PATH/libqgif.dylib install_name_tool -change $QTNETWORK_LINK @executable_path/../Frameworks/$QTNETWORK $BINARY
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/libqjpeg.dylib install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/imageformats/libqgif.dylib
install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY_PLUGIN_PATH/libqjpeg.dylib install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY_PLUGIN_PATH/imageformats/libqgif.dylib
QTCORE_LINK=$(otool -L $BINARY_FW_PATH/$QTGUI | grep QtCore | cut -d"(" -f1 | cut -f2) install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/imageformats/libqjpeg.dylib
install_name_tool -change $QTGUI_LINK @executable_path/../Frameworks/$QTGUI $BINARY_PLUGIN_PATH/imageformats/libqjpeg.dylib
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_PLUGIN_PATH/sqldrivers/libqsqlite.dylib
install_name_tool -change $QTSQL_LINK @executable_path/../Frameworks/$QTSQL $BINARY_PLUGIN_PATH/sqldrivers/libqsqlite.dylib
QTCORE_LINK=$(otool -L $BINARY_FW_PATH/$QTGUI | grep QtCore | head -1 | cut -d"(" -f1 | cut -f2)
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTGUI install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTGUI
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTSQL
install_name_tool -change $QTCORE_LINK @executable_path/../Frameworks/$QTCORE $BINARY_FW_PATH/$QTNETWORK
fi fi