flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 15:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed LIBS order, as I have run into gcc "undefined reference to" issued

Browse Source
This commit is contained in:
Klaus Basan
2014-02-26 14:33:15 +01:00
parent 5a16052e30
commit 1b846f44c8
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/blackcore/sample_blackcore.pro
View File

@@ -8,10 +8,10 @@ TEMPLATE = app
CONFIG += console c++11 CONFIG += console c++11
CONFIG -= app_bundle CONFIG -= app_bundle
DEPENDPATH += . ../../src/blackmisc ../../src/blackcore ../../src/blacksound DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore
INCLUDEPATH += . ../../src INCLUDEPATH += . ../../src
LIBS += -L../../lib -lblackcore -lblackmisc -lblacksound LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc
LIBS += -lvatlib LIBS += -lvatlib
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \

12
samples/blackgui/sample_blackgui.pro
View File

@@ -11,22 +11,22 @@ HEADERS += *.h
FORMS += *.ui FORMS += *.ui
CONFIG += c++11 CONFIG += c++11
DEPENDPATH += . ../../src/blackmisc ../../src/blackcore ../../src/blackgui ../../src/blacksound DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blackcore
INCLUDEPATH += . ../../src INCLUDEPATH += . ../../src
DESTDIR = ../../bin DESTDIR = ../../bin
LIBS += -L../../lib -lblackcore -lblackmisc -lblackgui -lblacksound LIBS += -L../../lib -lblackcore -lblackgui -lblacksound -lblackmisc
LIBS += -lvatlib LIBS += -lvatlib
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blackcore.lib \
../../lib/blackgui.lib \ ../../lib/blackgui.lib \
../../lib/blacksound.lib ../../lib/blacksound.lib \
../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblackcore.a \
../../lib/libblackgui.a \ ../../lib/libblackgui.a \
../../lib/libblacksound.a ../../lib/libblacksound.a \
../../lib/libblackcore.a
OTHER_FILES += *.qss OTHER_FILES += *.qss

2
samples/cli_client/sample_cli_client.pro
View File

@@ -14,7 +14,7 @@ INCLUDEPATH += . ../../src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
LIBS += -L../../lib -lblackcore -lblackmisc LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc
LIBS += -lvatlib LIBS += -lvatlib
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \

2
samples/voiceclient/sample_voice_client.pro
View File

@@ -15,7 +15,7 @@ INCLUDEPATH += . ../../src
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += *.h HEADERS += *.h
LIBS += -L../../lib -lblackcore -lblackmisc -lblacksound LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc
LIBS += -lvatlib LIBS += -lvatlib
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \

2
src/blackcore/blackcore.pro
View File

@@ -11,7 +11,7 @@ CONFIG += staticlib c++11
INCLUDEPATH += .. INCLUDEPATH += ..
DEPENDPATH += . .. DEPENDPATH += . ..
LIBS += -L../../lib -lblackmisc -lblacksound LIBS += -L../../lib -lblacksound -lblackmisc
# linux-g++* { QMAKE_CXXFLAGS += -std=c++0x } # linux-g++* { QMAKE_CXXFLAGS += -std=c++0x }
# PRECOMPILED_HEADER = stdpch.h # PRECOMPILED_HEADER = stdpch.h

2
src/blackgui/blackgui.pro
View File

@@ -9,6 +9,8 @@ CONFIG += staticlib c++11
INCLUDEPATH += .. INCLUDEPATH += ..
DEPENDPATH += . .. DEPENDPATH += . ..
LIBS += -L../../lib -lblackmisc
# PRECOMPILED_HEADER = stdpch.h # PRECOMPILED_HEADER = stdpch.h
precompile_header:!isEmpty(PRECOMPILED_HEADER) { precompile_header:!isEmpty(PRECOMPILED_HEADER) {
DEFINES += USING_PCH DEFINES += USING_PCH

2
src/blacksound/blacksound.pro
View File

@@ -14,6 +14,8 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) {
DEFINES += LOG_IN_FILE DEFINES += LOG_IN_FILE
LIBS += -L../../lib -lblackmisc
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a else: PRE_TARGETDEPS += ../../lib/libblackmisc.a