1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Default to non-package builds, unless STATICPKG=YES

Fixes #226
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-08-31 11:39:29 +02:00
parent c59d8f5349
commit e8757569d8
2 changed files with 12 additions and 5 deletions

2
debian/rules vendored
View File

@ -3,4 +3,4 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/qmake.mk
PREFIX=$(CURDIR)/debian/qtox/usr
QMAKE=qmake STATICPKG=YES

View File

@ -36,17 +36,24 @@ TRANSLATIONS = translations/de.ts \
RESOURCES += res.qrc
target.path = /usr/bin
INSTALLS += target
INCLUDEPATH += libs/include
# Rules for Windows, Mac OSX, and Linux
win32 {
LIBS += $$PWD/libs/lib/libtoxav.a $$PWD/libs/lib/libopus.a $$PWD/libs/lib/libvpx.a $$PWD/libs/lib/libopenal32.a $$PWD/libs/lib/libtoxcore.a -lws2_32 $$PWD/libs/lib/libsodium.a -lpthread -liphlpapi
} macx {
LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -lsodium -lvpx -framework OpenAL -lopencv_core -lopencv_highgui
} else {
# If we're building a package, static link libtox[core,av] and libsodium, since they are not provided by any package
contains(STATICPKG, YES) {
target.path = /usr/bin
INSTALLS += target
LIBS += -L$$PWD/libs/lib/ -Wl,-Bstatic -ltoxcore -ltoxav -lsodium -Wl,-Bdynamic -lopus -lvpx -lopenal -lopencv_core -lopencv_highgui
} else {
LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -lvpx -lopenal -lopencv_core -lopencv_highgui
}
}
#### Static linux build
#LIBS += -Wl,-Bstatic -ltoxcore -ltoxav -lsodium -lvpx -lopus \