refs #802 Enable build with Clang on Windows.

This commit is contained in:
Mathew Sutcliffe
2016-11-12 23:36:41 +00:00
committed by Klaus Basan
parent 95bfff36b0
commit 10ca2026a9
3 changed files with 35 additions and 15 deletions

View File

@@ -8,10 +8,10 @@ unix:!macx {
blackgui {
contains(BLACK_CONFIG, Static) {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackgui.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackgui.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.a
} else {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackgui.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackgui.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.dylib
@@ -22,10 +22,10 @@ blackgui {
blackcore {
contains(BLACK_CONFIG, Static) {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackcore.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackcore.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.a
} else {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackcore.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackcore.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.dylib
@@ -47,10 +47,10 @@ blacksound {
blackinput {
contains(BLACK_CONFIG, Static) {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackinput.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackinput.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.a
} else {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackinput.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackinput.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.dylib
@@ -69,10 +69,10 @@ blackinput {
blackmisc {
contains(BLACK_CONFIG, Static) {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackmisc.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackmisc.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.a
} else {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackmisc.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackmisc.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.dylib
@@ -85,7 +85,7 @@ blackmisc {
}
blackconfig {
win32-msvc*: PRE_TARGETDEPS += $$DestRoot/lib/blackconfig.lib
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackconfig.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackconfig.a
LIBS *= -lblackconfig
}