Attachment #359150 for bug #485480

View | Details | Raw Unified | Return to bug 485480
Collapse All | Expand All




    QMAKE_RC = $$QMAKE_RC /I \"$$LIBDENG_INCLUDE_DIR\"
}

LIBS += $$PWD/libdeng1/libdeng1.so
!useLibDir($$OUT_PWD/../libdeng1) {
    !useLibDir($$OUT_PWD/../../libdeng1) {
        useLibDir($$OUT_PWD/../../builddir/libdeng1)
    }
}

LIBS += -ldeng1

macx {
    defineTest(linkBinaryToBundledLibdeng1) {




# Build configuration for using the libdeng2 C wrapper.
INCLUDEPATH += $$PWD/libdeng2/include

LIBS += $$PWD/libdeng2/libdeng2.so
!useLibDir($$OUT_PWD/../libdeng2) {
    !useLibDir($$OUT_PWD/../../libdeng2) {
        !useLibDir($$OUT_PWD/../../../libdeng2) {
            useLibDir($$OUT_PWD/../../builddir/libdeng2)
        }
    }
}

LIBS += -ldeng2

macx {
    defineTest(linkToBundledLibdeng2) {




# Build configuration for using the libdeng_gui library.
INCLUDEPATH += $$PWD/libgui/include

LIBS += $$PWD/libgui/libdeng_gui.so
!useLibDir($$OUT_PWD/../libgui) {
    !useLibDir($$OUT_PWD/../../libgui) {
        !useLibDir($$OUT_PWD/../../../libgui) {
            useLibDir($$OUT_PWD/../../builddir/libgui)
        }
    }
}

LIBS += -ldeng_gui

macx {
    defineTest(linkBinaryToBundledLibdengGui) {




shellDir = libshell
INCLUDEPATH += $$PWD/$$shellDir/include

LIBS += $$PWD/$$shellDir/libdeng_shell.so
!useLibDir($$OUT_PWD/../$$shellDir) {
    !useLibDir($$OUT_PWD/../../$$shellDir) {
        !useLibDir($$OUT_PWD/../../../$$shellDir) {
            useLibDir($$OUT_PWD/../../builddir/$$shellDir)
        }
    }
}

LIBS += -ldeng_shell

macx {
    defineTest(linkBinaryToBundledLibdengShell) {

Return to bug 485480

Lines 7-20 win32 { Link Here

(-)a/doomsday/dep_deng1.pri (-8 / +1 lines)
7	QMAKE_RC = $$QMAKE_RC /I \"$$LIBDENG_INCLUDE_DIR\"	7	QMAKE_RC = $$QMAKE_RC /I \"$$LIBDENG_INCLUDE_DIR\"
8	}	8	}
9		9
10	# Use the appropriate library path (trying some alternatives).	10	LIBS += $$PWD/libdeng1/libdeng1.so
11	!useLibDir($$OUT_PWD/../libdeng1) {
12	!useLibDir($$OUT_PWD/../../libdeng1) {
13	useLibDir($$OUT_PWD/../../builddir/libdeng1)
14	}
15	}
16
17	LIBS += -ldeng1
18		11
19	macx {	12	macx {
20	defineTest(linkBinaryToBundledLibdeng1) {	13	defineTest(linkBinaryToBundledLibdeng1) {

Lines 1-16 Link Here

(-)a/doomsday/dep_deng2_cwrapper.pri (-10 / +1 lines)
1	# Build configuration for using the libdeng2 C wrapper.	1	# Build configuration for using the libdeng2 C wrapper.
2	INCLUDEPATH += $$PWD/libdeng2/include	2	INCLUDEPATH += $$PWD/libdeng2/include
3		3
4	# Use the appropriate library path.	4	LIBS += $$PWD/libdeng2/libdeng2.so
5	!useLibDir($$OUT_PWD/../libdeng2) {
6	!useLibDir($$OUT_PWD/../../libdeng2) {
7	!useLibDir($$OUT_PWD/../../../libdeng2) {
8	useLibDir($$OUT_PWD/../../builddir/libdeng2)
9	}
10	}
11	}
12
13	LIBS += -ldeng2
14		5
15	macx {	6	macx {
16	defineTest(linkToBundledLibdeng2) {	7	defineTest(linkToBundledLibdeng2) {

Lines 1-16 Link Here

(-)a/doomsday/dep_gui.pri (-10 / +1 lines)
1	# Build configuration for using the libdeng_gui library.	1	# Build configuration for using the libdeng_gui library.
2	INCLUDEPATH += $$PWD/libgui/include	2	INCLUDEPATH += $$PWD/libgui/include
3		3
4	# Use the appropriate library path.	4	LIBS += $$PWD/libgui/libdeng_gui.so
5	!useLibDir($$OUT_PWD/../libgui) {
6	!useLibDir($$OUT_PWD/../../libgui) {
7	!useLibDir($$OUT_PWD/../../../libgui) {
8	useLibDir($$OUT_PWD/../../builddir/libgui)
9	}
10	}
11	}
12
13	LIBS += -ldeng_gui
14		5
15	macx {	6	macx {
16	defineTest(linkBinaryToBundledLibdengGui) {	7	defineTest(linkBinaryToBundledLibdengGui) {

Lines 2-17 Link Here

(-)a/doomsday/dep_shell.pri (-10 / +1 lines)
2	shellDir = libshell	2	shellDir = libshell
3	INCLUDEPATH += $$PWD/$$shellDir/include	3	INCLUDEPATH += $$PWD/$$shellDir/include
4		4
5	# Use the appropriate library path.	5	LIBS += $$PWD/$$shellDir/libdeng_shell.so
6	!useLibDir($$OUT_PWD/../$$shellDir) {
7	!useLibDir($$OUT_PWD/../../$$shellDir) {
8	!useLibDir($$OUT_PWD/../../../$$shellDir) {
9	useLibDir($$OUT_PWD/../../builddir/$$shellDir)
10	}
11	}
12	}
13
14	LIBS += -ldeng_shell
15		6
16	macx {	7	macx {
17	defineTest(linkBinaryToBundledLibdengShell) {	8	defineTest(linkBinaryToBundledLibdengShell) {