summaryrefslogtreecommitdiffstats
path: root/src/angle/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/angle/src')
-rw-r--r--src/angle/src/common/common.pri6
-rw-r--r--src/angle/src/libEGL/libEGL.pro6
-rw-r--r--src/angle/src/libGLESv2/libGLESv2.pro8
3 files changed, 10 insertions, 10 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
index 12e26a9a68..58ad88673a 100644
--- a/src/angle/src/common/common.pri
+++ b/src/angle/src/common/common.pri
@@ -4,10 +4,10 @@ INCLUDEPATH += \
$$ANGLE_DIR/src \
$$ANGLE_DIR/include
-LIBS = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
+LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
# DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
-win32-msvc2012|winrt {
+win32-msvc2012|win32-msvc2013|winrt {
FXC = fxc.exe
} else {
DX_DIR = $$(DXSDK_DIR)
@@ -36,7 +36,7 @@ win32-msvc2012|winrt {
# Similarly we want the MinGW linker to use the import libraries shipped with the compiler
# instead of those from the SDK which cause a crash on startup.
- LIBS += -L\"$$DXLIB_DIR\"
+ LIBS_PRIVATE += -L\"$$DXLIB_DIR\"
}
}
diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro
index 3781bd7868..b5854189f9 100644
--- a/src/angle/src/libEGL/libEGL.pro
+++ b/src/angle/src/libEGL/libEGL.pro
@@ -4,11 +4,11 @@ TARGET = $$qtLibraryTarget(libEGL)
include(../common/common.pri)
angle_d3d11 {
- LIBS += -ld3d11
+ LIBS_PRIVATE += -ld3d11
} else {
- LIBS += -ld3d9
+ LIBS_PRIVATE += -ld3d9
}
-LIBS += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
+LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
HEADERS += \
$$ANGLE_DIR/src/libEGL/Config.h \
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index b39ce781e1..5b3a49ed56 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -8,18 +8,18 @@ INCLUDEPATH += $$OUT_PWD/.. $$ANGLE_DIR/src/libGLESv2
# Remember to adapt tools/configure/configureapp.cpp if the Direct X version changes.
angle_d3d11 {
- LIBS += -ldxgi -ld3d11
+ LIBS_PRIVATE += -ldxgi -ld3d11
} else {
- LIBS += -ld3d9
+ LIBS_PRIVATE += -ld3d9
}
-LIBS += -ldxguid
+LIBS_PRIVATE += -ldxguid
STATICLIBS = translator_common translator_hlsl preprocessor
for(libname, STATICLIBS) {
# Appends 'd' to the library for debug builds and builds up the fully
# qualified path to pass to the linker.
staticlib = $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}$$qtLibraryTarget($$libname).$${QMAKE_EXTENSION_STATICLIB}
- LIBS += $$staticlib
+ LIBS_PRIVATE += $$staticlib
PRE_TARGETDEPS += $$staticlib
}