Commit Graph

188 Commits

Author SHA1 Message Date
Sacha
43906e5e96 Qt and Blackberry buildfix. 2013-07-07 18:08:41 +10:00
Henrik Rydgard
a3a98c550a Update native (add jpgd) 2013-07-05 00:07:01 +02:00
Henrik Rydgård
c01a69df30 Merge branch 'master' of https://github.com/daniel-dressler/ppsspp into daniel-dressler-master
Conflicts:
	CMakeLists.txt
2013-07-03 17:59:44 +02:00
Sacha
676c000b8a Add FFMPEG to Qt Linux x86. Buildfix for CMake 2013-07-04 01:35:35 +10:00
Kingcom
24559491f0 Thread list in disassembly window 2013-07-02 23:21:20 +02:00
Kingcom
15eb8c8657 Breakpoint window 2013-07-02 00:20:19 +02:00
Henrik Rydgård
c28109dfa0 Merge pull request #2576 from Kingcom/master
Expression parser update
2013-07-01 08:23:42 -07:00
Henrik Rydgård
7c07f42e3e Merge pull request #2550 from codebase7/master
Allow user to define path to ffmpeg libraries
2013-06-30 23:59:26 -07:00
Kingcom
e3d3d75e38 Moved expression parser to native and changed how it's accessed 2013-07-01 01:41:06 +02:00
Henrik Rydgård
7df69decb6 Merge pull request #2556 from Kingcom/master
Memory view in disassembler
2013-06-30 08:45:30 -07:00
sum2012
c2091de3d5 Add dummy sceCcc
Fix loading of Gensou Chronicle
2013-06-30 20:21:56 +08:00
Kingcom
41ed77f66a Add a memory view control to the disassembly window 2013-06-30 13:42:19 +02:00
codebase7
7042799d5b Add manual ffmpeg path support to cmake
This commit adds support for allowing the user to define the full
path to the static ffmpeg libraries.

In addition it also makes cmake output the location for the
static ffmpeg libraries that it will use.
2013-06-30 05:27:21 -04:00
Daniel Dressler
a7a4ad5f06 Fix key map screen forgeting last pressed key 2013-06-29 19:20:23 -07:00
Kingcom
ab1aa09dce Expression parser 2013-06-29 15:17:00 +02:00
Sacha
8f163301eb Buildfix 2013-06-28 02:19:52 +10:00
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
Daniel Dressler
29271f67d7 Sync KeyMap to native changes 2013-06-24 21:34:14 -07: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