[patch] doomsday-1.10.2-link.patch

doomsday-1.10.2-link.patch (text/plain), 2.57 KB, created by Julian Ospald on 2013-09-20 21:20:31 UTC

commit 7dc47b66cb299b7c54865d9647903e142cf467c7
Author: hasufell <[e-mail]>
Date:   Fri Sep 20 23:10:02 2013 +0200

    BUILD: make sure we don't link against libs from the live system

diff --git a/doomsday/dep_deng1.pri b/doomsday/dep_deng1.pri
index 7e9dae2..f28819a 100644
--- a/doomsday/dep_deng1.pri
+++ b/doomsday/dep_deng1.pri
@@ -7,14 +7,7 @@ win32 {
     QMAKE_RC = $$QMAKE_RC /I \"$$LIBDENG_INCLUDE_DIR\"
 }
 
-# Use the appropriate library path (trying some alternatives).
-!useLibDir($$OUT_PWD/../libdeng1) {
-    !useLibDir($$OUT_PWD/../../libdeng1) {
-        useLibDir($$OUT_PWD/../../builddir/libdeng1)
-    }
-}
-
-LIBS += -ldeng1
+LIBS += $$PWD/libdeng1/libdeng1.so
 
 macx {
     defineTest(linkBinaryToBundledLibdeng1) {
diff --git a/doomsday/dep_deng2_cwrapper.pri b/doomsday/dep_deng2_cwrapper.pri
index 136ff5a..e706ca7 100644
--- a/doomsday/dep_deng2_cwrapper.pri
+++ b/doomsday/dep_deng2_cwrapper.pri
@@ -1,16 +1,7 @@
 # Build configuration for using the libdeng2 C wrapper.
 INCLUDEPATH += $$PWD/libdeng2/include
 
-# Use the appropriate library path.
-!useLibDir($$OUT_PWD/../libdeng2) {
-    !useLibDir($$OUT_PWD/../../libdeng2) {
-        !useLibDir($$OUT_PWD/../../../libdeng2) {
-            useLibDir($$OUT_PWD/../../builddir/libdeng2)
-        }
-    }
-}
-
-LIBS += -ldeng2
+LIBS += $$PWD/libdeng2/libdeng2.so
 
 macx {
     defineTest(linkToBundledLibdeng2) {
diff --git a/doomsday/dep_gui.pri b/doomsday/dep_gui.pri
index bbcc60f..d1a24ab 100644
--- a/doomsday/dep_gui.pri
+++ b/doomsday/dep_gui.pri
@@ -1,16 +1,7 @@
 # Build configuration for using the libdeng_gui library.
 INCLUDEPATH += $$PWD/libgui/include
 
-# Use the appropriate library path.
-!useLibDir($$OUT_PWD/../libgui) {
-    !useLibDir($$OUT_PWD/../../libgui) {
-        !useLibDir($$OUT_PWD/../../../libgui) {
-            useLibDir($$OUT_PWD/../../builddir/libgui)
-        }
-    }
-}
-
-LIBS += -ldeng_gui
+LIBS += $$PWD/libgui/libdeng_gui.so
 
 macx {
     defineTest(linkBinaryToBundledLibdengGui) {
diff --git a/doomsday/dep_shell.pri b/doomsday/dep_shell.pri
index 6d70554..d9a256f 100644
--- a/doomsday/dep_shell.pri
+++ b/doomsday/dep_shell.pri
@@ -2,16 +2,7 @@
 shellDir = libshell
 INCLUDEPATH += $$PWD/$$shellDir/include
 
-# Use the appropriate library path.
-!useLibDir($$OUT_PWD/../$$shellDir) {
-    !useLibDir($$OUT_PWD/../../$$shellDir) {
-        !useLibDir($$OUT_PWD/../../../$$shellDir) {
-            useLibDir($$OUT_PWD/../../builddir/$$shellDir)
-        }
-    }
-}
-
-LIBS += -ldeng_shell
+LIBS += $$PWD/$$shellDir/libdeng_shell.so
 
 macx {
     defineTest(linkBinaryToBundledLibdengShell) {