From 8c2eeca9d790959bc5f0d6f1baf57884088b2dc2 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 11 Mar 2019 01:27:08 +0100 Subject: update project file --- Attorney_Online.pro | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Attorney_Online.pro') diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c0bc4abb..c063740a 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -12,7 +12,15 @@ MOC_DIR = $$PWD/build SOURCES += $$files($$PWD/src/*.cpp) HEADERS += $$files($$PWD/include/*.h) -LIBS += -L$$PWD/lib -lbass -ldiscord-rpc + + +LIBS += -L$$PWD/lib -ldiscord-rpc + +#AUDIO = BASS + +equals(AUDIO, "BASS") { +LIBS += -L$$PWD/lib -lbass +} CONFIG += c++14 -- cgit From e4edb7e127b0513aec7ebe62da5c542ef6def7ce Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:27:00 +0100 Subject: project rules where i can configure stuff --- Attorney_Online.pro | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Attorney_Online.pro') diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c063740a..e5ea474d 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -14,15 +14,21 @@ SOURCES += $$files($$PWD/src/*.cpp) HEADERS += $$files($$PWD/include/*.h) -LIBS += -L$$PWD/lib -ldiscord-rpc +LIBS += -L$$PWD/lib -#AUDIO = BASS +DISCORD = NO -equals(AUDIO, "BASS") { -LIBS += -L$$PWD/lib -lbass +equals(DISCORD, "YES") { +LIBS += -ldiscord-rpc +DEFINES += DISCORD } -CONFIG += c++14 +AUDIO += NO + +equals(AUDIO, "BASSAUDIO") { +LIBS += -lbass +DEFINES += BASSAUDIO +} RESOURCES += resources.qrc -- cgit From dbb05f2b4b0b32ae1b49735847211df6464c59af Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:31:01 +0100 Subject: c++ 14 i guess this is important --- Attorney_Online.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Attorney_Online.pro') diff --git a/Attorney_Online.pro b/Attorney_Online.pro index e5ea474d..357958f6 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -30,6 +30,8 @@ LIBS += -lbass DEFINES += BASSAUDIO } +CONFIG += c++14 + RESOURCES += resources.qrc win32:RC_ICONS = resource/logo.ico -- cgit From fced80661c1342e8622dba9f35c7db43d69e52a9 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:46:27 +0100 Subject: looks like multimedia isn't really necessary --- Attorney_Online.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Attorney_Online.pro') diff --git a/Attorney_Online.pro b/Attorney_Online.pro index 357958f6..c2bd7e95 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -1,4 +1,4 @@ -QT += core gui widgets multimedia network +QT += core gui widgets network TARGET = Attorney_Online TEMPLATE = app -- cgit From 3fb6b50d104b5ed247ffe7a0ac03d0a7049d522a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:27:38 +0100 Subject: cleanup qmakefile --- Attorney_Online.pro | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Attorney_Online.pro') diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c2bd7e95..351f2b38 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -16,18 +16,22 @@ HEADERS += $$files($$PWD/include/*.h) LIBS += -L$$PWD/lib -DISCORD = NO +#DEFINES += DISCORD -equals(DISCORD, "YES") { +contains(DEFINES, DISCORD) { LIBS += -ldiscord-rpc -DEFINES += DISCORD } -AUDIO += NO +#DEFINES += BASSAUDIO -equals(AUDIO, "BASSAUDIO") { +contains(DEFINES, BASSAUDIO) { LIBS += -lbass -DEFINES += BASSAUDIO +} + +#DEFINES += QTAUDIO + +contains(DEFINES, QTAUDIO) { +QT += multimedia } CONFIG += c++14 -- cgit