Commit Graph

171 Commits

Author SHA1 Message Date
Henrik Rydgård
ed47eac63d Merge pull request #2381 from thedax/hdRemasterSupport
Add preliminary support for PS3 PSP HD Remasters.
2013-06-26 14:13:01 -07:00
The Dax
dfd70d993c Add HDRemaster.cpp/.h to Android.mk and CMakeLists.txt. 2013-06-26 16:02:53 -04:00
Jake Traynham
e052a2d8da Updated CMakeLists to include new iOS Audio files 2013-06-25 16:38:30 -05:00
Jake Traynham
24961e28ef iOS Audio fixes 2013-06-25 16:18:16 -05:00
Jake Traynham
771de1c3a3 pulled down update to ffmpeg 2013-06-24 17:48:37 -05:00
Sacha
008cb0fa70 Update ffmpeg scripts for Symbian and CMake 2013-06-24 21:07:29 +10:00
Henrik Rydgard
4eb1638cc3 Merge remote-tracking branch 'origin' into mp3-support
Conflicts:
	Core/HLE/sceAudio.cpp
	Core/HLE/sceMp3.cpp
2013-06-22 18:08:43 +02:00
Sacha
b90504a0dc CMake ffmpeg: Use correct include dir (which does vary for each platform). 2013-06-22 01:33:55 +10:00
Sacha
2570268393 Remove 'BLACKBERRY10' define as it is now the minimum OS requirement. 2013-06-21 15:40:52 +10:00
Sacha
5f01acd03b Clean up CMakeLists with regards to FFMPEG. 2013-06-21 15:33:29 +10:00
Jake Traynham
e89b2055a6 Reenabled armv7s for iOS with JIT fixes 2013-06-20 11:44:59 -05:00
Henrik Rydgård
ad4b2ea009 Merge pull request #2328 from jtraynham/master
Make the iOS build only compile for the armv7 architecture
2013-06-17 12:26:39 -07:00
jtraynham
e00c345b1d Make the iOS build only compile for the armv7 architecture 2013-06-17 14:06:00 -05:00
Sacha
503b9d9e2b Fix Blackberry10 building on non-Windows systems. 2013-06-16 21:12:24 +10:00
Henrik Rydgård
c128f164ed Fix PPSSPPSDL on MacOSX, link ffmpeg. 2013-06-15 15:05:00 +02:00
Jake Traynham
4daa042529 added FFMPEG support in iOS build
Also added a new README with more detailed instructions on compiling
the iOS version
2013-06-13 12:07:09 -05:00
Sacha
fb3c2cc87a Increase optimisations on Blackberry. 2013-06-12 10:52:20 +10:00
Henrik Rydgård
c98d2eb707 Merge pull request #2124 from chaserhkj/linux-fix
Fixed a build error on non-win32 platfroms
2013-06-10 07:22:16 -07:00
Sacha
29d1e40c79 Buildfix for Blackberry, Linux, Symbian, non-ffmpeg platforms, Meego, ... 2013-06-09 22:53:22 +10:00
Unknown W. Brackets
3acdc7437f Buildfix for Linux. 2013-06-09 02:17:17 -07:00
Henrik Rydgard
533541615f Merge branch 'master' of github.com:hrydgard/ppsspp
Conflicts:
	UI/GameInfoCache.h
2013-06-08 23:01:49 +02:00
Henrik Rydgard
bb3c91f8bb Some New-UI work (disabled, it's not really ready yet). 2013-06-08 22:47:06 +02:00
Arthur Blot
f03ae843d2 Add ffmpeg in SDL build 2013-06-08 19:48:10 +02:00
HuangKangJing
388f20721a Modified the dl link flag to linux platform only 2013-06-07 16:56:27 +08:00
HuangKangJing
40d521e917 Use CMAKE_DL_LIBS instead of dl 2013-06-07 12:02:27 +08:00
HuangKangJing
02899bdff7 Fix a build error on linux platforms
Due to dl* function usage in Core/HW/atrac3plus.cpp on non-windows
platforms, Core library needs to be linked with -ldl flag on these
platforms.

Added a CoreExtraLibs variable in CMakeLists.txt to handle all
platform-dependent dependencies of Core, and added dl to this variable
on non-win32 platforms.
2013-06-07 10:58:31 +08:00
Sacha
e007a299cf CMake and Meego buildfix. 2013-06-06 03:43:10 +10:00
Henrik Rydgard
f0385aa2ac Use FFMPEG on 64-bit Windows, now that there's a build. 2013-06-03 21:46:10 +02:00
Sacha
1cb007693f Link swscale for Blackberry. 2013-06-02 23:47:31 +10:00
Henrik Rydgard
230d0b3679 Buildfixes 2013-06-01 23:37:51 +02:00
Sacha
19f6beb35b Update native for Blackberry. New BB10 frontend. 2013-06-01 16:06:07 +10:00
Henrik Rydgard
ab4987bc20 Update to latest version of "native" 2013-05-31 23:10:58 +02:00
Henrik Rydgård
9b36333aac Merge pull request #1995 from jtraynham/master
Added iCade support to the iOS Build
2013-05-31 01:37:06 -07:00
Unknown W. Brackets
ee751d6fdd Buildfix for Linux, fixes #1994. 2013-05-30 22:42:27 -07:00
Jake Traynham
dc25d42eca Added iCade support to the iOS build 2013-05-30 20:58:41 -05:00
raven02
8e9e8f8291 Remove duplicate MediaEngine.h 2013-05-31 02:52:42 +08:00
Henrik Rydgard
572eb26305 Merge branch 'master' into makotech222-cwcheat
Conflicts:
	Core/Core.vcxproj.filters
	Core/HLE/__sceAudio.cpp
	Core/HLE/sceKernel.cpp
2013-05-30 19:11:20 +02:00
King_DuckZ
3004e5d194 Command line warning fix on intel compiler under Linux. 2013-05-30 15:40:55 +02:00
King_DuckZ
3851ffeb71 Buildfix - missing file in CMakeLists.txt 2013-05-30 15:40:55 +02:00
Henrik Rydgard
546b6c0fca Update cmake 2013-05-30 14:01:48 +02:00
Henrik Rydgård
0b1d756ca1 Fix PPSSPPHeadless CMake build. 2013-05-23 21:32:22 +02:00
Henrik Rydgard
9fa61c7110 Add cwcheat to android and cmake builds 2013-05-22 21:06:10 +02:00
Henrik Rydgard
059aed36ee Add on-screen feedback for some keyboard shortcuts (so you know which setting was changed) 2013-05-22 18:00:06 +02:00
Sacha
7ff2af9aed Remove Playbook OS support. 2013-05-20 23:18:41 +10:00
mgaver
e2bcbf6551 Update CMakeLists.txt
Remove the duplicated framework.
2013-05-17 00:10:45 +09:00
mattweb28
d3ded6639a Added sceJpeg & sceMd5 2013-05-15 19:49:34 +08:00
Sacha
42bf90728f -O2 wasn't taking effect. Improves performance significantly for Blackberry. 2013-05-14 00:12:23 +10:00
Florent Castelli
501f705ba3 Merge mp3 support from Orphis' old FFMPEG code.
Conflicts:
	CMakeLists.txt
	Core/HLE/sceAudio.cpp
	Core/HLE/sceMp3.cpp
	Core/HLE/sceMpeg.cpp
2013-05-12 19:13:10 +02:00
Sacha
7ee84eb811 Add FFMPEG support to Blackberry10 2013-05-11 00:55:00 +10:00
Sacha
0101636473 Buildfix: Symbian, CMake-based compiles. 2013-05-09 04:29:23 +10:00