libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-09 02:26:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6952 from fcooper/master-bbb-support

Browse Source 
Support ARM Linux device and add Beaglebone as a support device
This commit is contained in:
Henrik Rydgård 2014-10-18 11:11:49 +02:00
commit 259c6c94c4
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -32,6 +32,13 @@ if(RPI)
set(MOBILE_DEVICE OFF) set(MOBILE_DEVICE OFF)
endif() endif()
if(BB)
set(MOBILE_DEVICE OFF)
set(ARMV7 ON)
set(USING_FBDEV ON)
endif()
if(USING_EGL) if(USING_EGL)
# Default to GLES2 but could be GL. # Default to GLES2 but could be GL.
set(USING_GLES2 ON) set(USING_GLES2 ON)
@ -74,6 +81,7 @@ option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
option(BLACKBERRY "Set to ON if targeting a Blackberry device" ${BLACKBERRY}) option(BLACKBERRY "Set to ON if targeting a Blackberry device" ${BLACKBERRY})
option(IOS "Set to ON if targeting an iOS device" ${IOS}) option(IOS "Set to ON if targeting an iOS device" ${IOS})
option(MAEMO "Set to ON if targeting a Maemo (N900) device" ${MAEMO}) option(MAEMO "Set to ON if targeting a Maemo (N900) device" ${MAEMO})
option(BB "Set to ON if targeting a Beaglebone/Beaglebone Black device" ${BB})
# :: Environments # :: Environments
option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL}) option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL})
option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV}) option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV})
@ -409,7 +417,11 @@ if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
elseif(MACOSX) elseif(MACOSX)
set(PLATFORM_ARCH "macosx/x86_64") set(PLATFORM_ARCH "macosx/x86_64")
elseif(LINUX) elseif(LINUX)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(ARMV7)
set(PLATFORM_ARCH "linux/armv7")
elseif(ARM)
set(PLATFORM_ARCH "linux/arm")
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(PLATFORM_ARCH "linux/x86_64") set(PLATFORM_ARCH "linux/x86_64")
else() else()
set(PLATFORM_ARCH "linux/x86") set(PLATFORM_ARCH "linux/x86")
@ -684,7 +696,11 @@ set(nativeExtra)
set(nativeExtraLibs) set(nativeExtraLibs)
if(ARMV7) if(ARMV7)
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9") if(BB)
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a8")
else()
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
endif()
set(nativeExtra ${nativeExtra} set(nativeExtra ${nativeExtra}
native/math/fast/fast_matrix_neon.S) native/math/fast/fast_matrix_neon.S)
endif() endif()

2
Common/MemArena.cpp
View File

@ -99,6 +99,8 @@ int ashmem_unpin_region(int fd, size_t offset, size_t len)
// do not make this "static" // do not make this "static"
#ifdef MAEMO #ifdef MAEMO
std::string ram_temp_file = "/home/user/gc_mem.tmp"; std::string ram_temp_file = "/home/user/gc_mem.tmp";
#elif defined(BB)
std::string ram_temp_file = "/home/root/gc_mem.tmp";
#else #else
std::string ram_temp_file = "/tmp/gc_mem.tmp"; std::string ram_temp_file = "/tmp/gc_mem.tmp";
#endif #endif