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.
hrydgard · May 1, 2016 · c30287c · c30287c
1 parent 994d2dd
commit c30287c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Qt/GPU.pro b/Qt/GPU.pro
@@ -61,7 +61,8 @@ SOURCES += $$P/GPU/GeDisasm.cpp \ # GPU
 	$$P/GPU/Common/SplineCommon.cpp \
 	$$P/GPU/Common/DrawEngineCommon.cpp \
 	$$P/ext/xxhash.c \ # xxHash
-	$$P/ext/xbrz/*.cpp # XBRZ
+	$$P/ext/xbrz/*.cpp \ # XBRZ
+	$$P/Core/TextureReplacer.cpp # Bit of a hack.  Avoids a linking issue.
 
 armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
 

diff --git a/Qt/Settings.pri b/Qt/Settings.pri
@@ -67,6 +67,11 @@ win32-msvc* {
 	QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math
 }
 
+symbian {
+	# Silence a common warning in system headers.
+	QMAKE_CXXFLAGS += -Wno-address
+}
+
 contains(QT_CONFIG, opengles.) {
 	DEFINES += USING_GLES2
 	# How else do we know if the environment prefers windows?