Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Support other MSVC compilers in Qt. Update native reference.

Browse source
This commit is contained in:
Sacha 2013-02-14 01:34:53 +10:00
parent aac079f5ac
commit 3faeeea2f9
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Common/CPUDetect.cpp
View file

@ -27,7 +27,6 @@
#undef _interlockedbittestandreset #undef _interlockedbittestandreset
#undef _interlockedbittestandset64 #undef _interlockedbittestandset64
#undef _interlockedbittestandreset64 #undef _interlockedbittestandreset64
#include <windows.h>
#else #else
#ifndef _M_GENERIC #ifndef _M_GENERIC

2
Qt/Core.pro
View file

@ -6,7 +6,7 @@ CONFIG += staticlib
include(Settings.pri) include(Settings.pri)
INCLUDEPATH += ../native ../Core/MIPS ../Common ../ INCLUDEPATH += ../native ../Core/MIPS ../
arm { arm {
SOURCES += ../Core/MIPS/ARM/*.cpp \ #CoreARM SOURCES += ../Core/MIPS/ARM/*.cpp \ #CoreARM

12
Qt/Settings.pri
View file

@ -4,11 +4,13 @@ unix:!blackberry:!symbian:!macx: CONFIG += linux
# Global specific # Global specific
DEFINES -= UNICODE DEFINES -= UNICODE
INCLUDEPATH += ../ext/zlib ../native/ext/glew INCLUDEPATH += ../ext/zlib ../native/ext/glew ../Common
win32-msvc2010 { win32-msvc* {
QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast
DEFINES += _MBCS GLEW_STATIC DEFINES += _MBCS GLEW_STATIC NOMINMAX
PRECOMPILED_HEADER = ../Windows/stdafx.h
PRECOMPILED_SOURCE = ../Windows/stdafx.cpp
} else { } else {
QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
QMAKE_CXXFLAGS += -std=c++0x -ffast-math -fno-strict-aliasing QMAKE_CXXFLAGS += -std=c++0x -ffast-math -fno-strict-aliasing
@ -16,7 +18,7 @@ win32-msvc2010 {
# Arch specific # Arch specific
contains(QT_ARCH, i686)|contains(QT_ARCH, x86)|contains(QT_ARCH, x86_64)|contains(QT_ARCH, windows): { contains(QT_ARCH, i686)|contains(QT_ARCH, x86)|contains(QT_ARCH, x86_64)|contains(QT_ARCH, windows): {
!win32-msvc2010: QMAKE_CXXFLAGS += -msse2 !win32-msvc*: QMAKE_CXXFLAGS += -msse2
CONFIG += x86 CONFIG += x86
} }
else { # Assume ARM else { # Assume ARM

2
native

@ -1 +1 @@
Subproject commit 3caced8524c06cabcf968942a7780d80337de7bf Subproject commit f5e7bd5a9c3e4b39a4eac71b577f06ad54f2bc96