Skip to content

Commit c30287c

Browse files
Another buildfix for Qt, linking issue.
This is a bit of a hack, but it resolves the linking issue that only seems to happen in the Qt build system.
1 parent 994d2dd commit c30287c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Qt/GPU.pro

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU
6161
$$P/GPU/Common/SplineCommon.cpp \
6262
$$P/GPU/Common/DrawEngineCommon.cpp \
6363
$$P/ext/xxhash.c \ # xxHash
64-
$$P/ext/xbrz/*.cpp # XBRZ
64+
$$P/ext/xbrz/*.cpp \ # XBRZ
65+
$$P/Core/TextureReplacer.cpp # Bit of a hack. Avoids a linking issue.
6566

6667
armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
6768

Qt/Settings.pri

+5
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ win32-msvc* {
6767
QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math
6868
}
6969

70+
symbian {
71+
# Silence a common warning in system headers.
72+
QMAKE_CXXFLAGS += -Wno-address
73+
}
74+
7075
contains(QT_CONFIG, opengles.) {
7176
DEFINES += USING_GLES2
7277
# How else do we know if the environment prefers windows?

0 commit comments

Comments
 (0)