diff options
Diffstat (limited to 'src/angle/src/compiler')
-rw-r--r-- | src/angle/src/compiler/translator_common.pro | 9 | ||||
-rw-r--r-- | src/angle/src/compiler/translator_hlsl.pro | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/angle/src/compiler/translator_common.pro b/src/angle/src/compiler/translator_common.pro index b2812158e1..c8f86d6b10 100644 --- a/src/angle/src/compiler/translator_common.pro +++ b/src/angle/src/compiler/translator_common.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(translator_common) include(../config.pri) # Mingw 4.7 chokes on implicit move semantics, so disable C++11 here -win32-g++*: CONFIG -= c++11 +mingw: CONFIG -= c++11 INCLUDEPATH += \ $$ANGLE_DIR/src \ @@ -78,7 +78,6 @@ SOURCES += \ $$ANGLE_DIR/src/compiler/intermOut.cpp \ $$ANGLE_DIR/src/compiler/IntermTraverse.cpp \ $$ANGLE_DIR/src/compiler/MapLongVariableNames.cpp \ - $$ANGLE_DIR/src/compiler/ossource_win.cpp \ $$ANGLE_DIR/src/compiler/parseConst.cpp \ $$ANGLE_DIR/src/compiler/ParseHelper.cpp \ $$ANGLE_DIR/src/compiler/PoolAlloc.cpp \ @@ -98,6 +97,12 @@ SOURCES += \ $$ANGLE_DIR/src/compiler/timing/RestrictVertexShaderTiming.cpp \ $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.cpp +winrt { + SOURCES += $$ANGLE_DIR/src/compiler/ossource_winrt.cpp +} else { + SOURCES += $$ANGLE_DIR/src/compiler/ossource_win.cpp +} + # NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}_lex.cpp ${QMAKE_FILE_NAME} flex.output = ${QMAKE_FILE_BASE}_lex.cpp diff --git a/src/angle/src/compiler/translator_hlsl.pro b/src/angle/src/compiler/translator_hlsl.pro index 1c31cad297..f19d33a530 100644 --- a/src/angle/src/compiler/translator_hlsl.pro +++ b/src/angle/src/compiler/translator_hlsl.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(translator_hlsl) include(../config.pri) # Mingw 4.7 chokes on implicit move semantics, so disable C++11 here -win32-g++*: CONFIG -= c++11 +mingw: CONFIG -= c++11 INCLUDEPATH += $$ANGLE_DIR/src \ $$ANGLE_DIR/include |