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

Remove redundant armv7 defines.

Browse source
This commit is contained in:
Sacha 2014-06-11 15:15:19 +10:00
parent 3e97713d16
commit 4ed944a576
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -201,7 +201,7 @@ if(NOT MSVC)
if(BLACKBERRY)
add_definitions(-D_QNX_SOURCE)
if(ARM)
add_definitions(-DARMV7 -O3 -mfpu=neon -mcpu=cortex-a9)
add_definitions(-O3 -march=armv7-a -mfpu=neon -mcpu=cortex-a9)
endif()
endif()
@ -215,7 +215,6 @@ if(NOT MSVC)
# armv7s (without resorting to FastMemory) is still a work in progress
# comment out the next line to enable default/"standard" architectures (which is a fat armv7/armv7s binary)
set(CMAKE_OSX_ARCHITECTURES "armv7")
add_definitions(-DARMV7)
elseif(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__")
# Karen/angelXwind: --macosx-version-min=10.7 is needed in order to produce binaries that OS X 10.7 Lion can execute. However, it seems that PPSSPP won't support 10.6 or lower without getting rid of -stdlib=libc++ ...which probably won't end well. So I guess PPSSPP will strictly be a 10.7+ app.

2
GPU/Common/TextureDecoder.cpp
View file

@ -162,7 +162,7 @@ ReliableHashFunc DoReliableHash = &XXH32;
// This has to be done after CPUDetect has done its magic.
void SetupTextureDecoder() {
#ifdef ARMV7
#ifdef HAVE_ARMV7
if (cpu_info.bNEON) {
DoQuickTexHash = &QuickTexHashNEON;
DoUnswizzleTex16 = &DoUnswizzleTex16NEON;

1
Qt/Settings.pri
View file

@ -42,7 +42,6 @@ macx|contains(QT_ARCH, windows)|count(xarch, 1) {
}
arm:!symbian {
CONFIG += armv7
DEFINES += ARMEABI_V7A ARMV7
QMAKE_CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -ffast-math -mfloat-abi=softfp
QMAKE_CXXFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -ffast-math -mfloat-abi=softfp
}

2
android/jni/Locals.mk
View file

@ -25,7 +25,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavutil.a
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv7/include
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A -DARMV7
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A
endif
ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavformat.a

2
ffmpeg

@ -1 +1 @@
Subproject commit 551ca6e79a9643c26a46ff341afe0de93b79a1c1
Subproject commit bc6302be00fdb71ac5e24b40c5e826d4e8a9a2ac

2
native

@ -1 +1 @@
Subproject commit d7cb2508d70d6049dea4075b30ec8b53df39b06c
Subproject commit d809cf9e37d114b52b4ab152df1d187cee0ea91b