1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
Description: Change rpath and library path
libtmw doesn't have correct rpath. We add rpath for it.
Also we want to install libraries to /usr/lib/tiled so we made some changes
to the libpath.
Author: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
Last-Update: 2013-02-07
---
Index: tiled-qt-1.1.4/src/tiled/tiled.pro
===================================================================
--- tiled-qt-1.1.4.orig/src/tiled/tiled.pro
+++ tiled-qt-1.1.4/src/tiled/tiled.pro
@@ -60,7 +60,7 @@ macx {
# Make sure the Tiled executable can find libtiled
!win32:!macx:!cygwin:contains(RPATH, yes) {
- QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ QMAKE_RPATHDIR += \$\$ORIGIN/../lib/tiled
# It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
Index: tiled-qt-1.1.4/src/plugins/plugin.pri
===================================================================
--- tiled-qt-1.1.4.orig/src/plugins/plugin.pri
+++ tiled-qt-1.1.4/src/plugins/plugin.pri
@@ -28,7 +28,7 @@ macx {
# Set rpath so that the plugin will resolve libtiled correctly
!win32:!macx:!cygwin:contains(RPATH, yes) {
- QMAKE_RPATHDIR += \$\$ORIGIN/../..
+ QMAKE_RPATHDIR += \$\$ORIGIN/..
# It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
Index: tiled-qt-1.1.4/src/tmxviewer/tmxviewer.pro
===================================================================
--- tiled-qt-1.1.4.orig/src/tmxviewer/tmxviewer.pro
+++ tiled-qt-1.1.4/src/tmxviewer/tmxviewer.pro
@@ -24,7 +24,7 @@ macx {
# Make sure the executable can find libtiled
!win32:!macx:!cygwin:contains(RPATH, yes) {
- QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ QMAKE_RPATHDIR += \$\$ORIGIN/../lib/tiled
# It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
Index: tiled-qt-1.1.4/src/automappingconverter/automappingconverter.pro
===================================================================
--- tiled-qt-1.1.4.orig/src/automappingconverter/automappingconverter.pro
+++ tiled-qt-1.1.4/src/automappingconverter/automappingconverter.pro
@@ -17,7 +17,7 @@ macx {
# Make sure the executable can find libtiled
!win32:!macx:!cygwin:contains(RPATH, yes) {
- QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ QMAKE_RPATHDIR += \$\$ORIGIN/../lib/tiled
# It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
Index: tiled-qt-1.1.4/src/tmxrasterizer/tmxrasterizer.pro
===================================================================
--- tiled-qt-1.1.4.orig/src/tmxrasterizer/tmxrasterizer.pro
+++ tiled-qt-1.1.4/src/tmxrasterizer/tmxrasterizer.pro
@@ -24,7 +24,7 @@ macx {
# Make sure the executable can find libtiled
!win32:!macx:!cygwin:contains(RPATH, yes) {
- QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ QMAKE_RPATHDIR += \$\$ORIGIN/../lib/tiled
# It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
Index: tiled-qt-1.1.4/src/terraingenerator/terraingenerator.pro
===================================================================
--- tiled-qt-1.1.4.orig/src/terraingenerator/terraingenerator.pro
+++ tiled-qt-1.1.4/src/terraingenerator/terraingenerator.pro
@@ -24,7 +24,7 @@ macx {
# Make sure the executable can find libtiled
!win32:!macx:!cygwin:contains(RPATH, yes) {
- QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ QMAKE_RPATHDIR += \$\$ORIGIN/../lib/tiled
# It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
|
