mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

* Fixed macdeploy scripts for VLC2 and Qt 4.8.2.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-12 00:47:27 +02:00
parent 695feed2b6
commit 88ea5f7855
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/mac/macdeploy.py
View File

@@ -206,7 +206,7 @@ TOMAHAWK_PLUGINS = [
] ]
QT_PLUGINS_SEARCH_PATH=[ QT_PLUGINS_SEARCH_PATH=[
'/usr/local/Cellar/qt/4.7.4/plugins', '/usr/local/Cellar/qt/4.8.2/plugins',
] ]
@@ -249,7 +249,7 @@ frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
commands.append(['mkdir', '-p', frameworks_dir]) commands.append(['mkdir', '-p', frameworks_dir])
resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources') resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
commands.append(['mkdir', '-p', resources_dir]) commands.append(['mkdir', '-p', resources_dir])
plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns') plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name) binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
fixed_libraries = [] fixed_libraries = []
@@ -489,7 +489,7 @@ def FindVLCPlugin(name):
FixBinary(binary) FixBinary(binary)
for plugin in VLC_PLUGINS: for plugin in VLC_PLUGINS:
FixVLCPlugin(FindVLCPlugin(plugin), '../Frameworks/vlc/plugins') FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
for plugin in TOMAHAWK_PLUGINS: for plugin in TOMAHAWK_PLUGINS:
FixPlugin(plugin, '../MacOS') FixPlugin(plugin, '../MacOS')

2
admin/mac/qt.conf
View File

@@ -1,2 +1,2 @@
[Paths] [Paths]
Plugins = PlugIns Plugins = qt-plugins