Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,225 Commits 93 Branches 131 Tags
7f0305a954d147be189d77a9147180ca74c45ecf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florent Castelli db80e3fb23 Add missing Google Maven repository 2017-11-05 15:26:33 +01:00
Florent Castelli 7d4c8780e5 cmake: Fix linking against system Snappy 2017-03-19 18:44:12 +01:00
Florent Castelli e0cce7602b cmake: Fix linking against system GLEW 2017-03-19 18:44:12 +01:00
Florent Castelli 47ee86ebc4 Merge pull request #9180 from hrydgard/glew_fix 
cmake: Fix system GLEW usage
 2016-12-22 00:29:14 +01:00
Florent Castelli c35f6c160b cmake: Fix system GLEW usage 2016-12-21 22:53:28 +01:00
Florent Castelli 2cf3f0247a Merge pull request #9169 from Orphis/ios 
FFmpeg and iOS updates
 2016-12-19 02:29:05 +01:00
Florent Castelli 2ba04f3bcd ios: Enable building for arm64 and simulator 2016-12-19 02:07:08 +01:00
Florent Castelli 2149d3db7f cmake: New FindFFmpeg module 
This new module should be able to handle both libraries in the regular
paths and fallback to pkg-config.
It is also able to find dynamic libraries, not just static libraries.
It will generate imported targets with the name FFmpeg::<lib> that you
can use in your scripts.

The way it’s used in our main build script has been updated to match.
We also won’t link external libraries used by ffmpeg automatically since
it is not reliable and depend on custom options.
You should use a proper static build with no external dependencies or
a shared build that will have the proper dependencies listed.
 2016-12-19 02:07:08 +01:00
Florent Castelli b8f0f7e35a Update ffmpeg submodule 2016-12-19 02:07:08 +01:00
Florent Castelli c3dab84bca Merge pull request #9168 from Orphis/cmake_cleanup 
Cmake cleanup
 2016-12-18 22:33:31 +01:00
Florent Castelli 5db12ca54d Fix arch detection for fast_matrix_mul 
Needed for iOS Simulator build
 2016-12-18 22:17:41 +01:00
Florent Castelli 46fdc0f5f5 cmake: Move some cmake includes to ext 2016-12-18 22:17:41 +01:00
Florent Castelli 6852c602b9 glew: Move to ext 2016-12-18 21:13:45 +01:00
Florent Castelli da97119388 Merge pull request #9109 from joolswills/rpi_link_libs 
Look in /opt/vc/lib for rpi opengl libs - #9104
 2016-11-01 18:49:39 +01:00
Florent Castelli 934aff4733 Merge pull request #9100 from Orphis/cmake_cleanup 
cmake: Update FindSDL2 and use imported target
 2016-10-29 20:12:42 +02:00
Florent Castelli 4966997826 Merge pull request #9101 from Orphis/cmake_output 
cmake: Don't hide CMake's output
 2016-10-29 20:12:34 +02:00
Florent Castelli 2b31e5b2d5 cmake: Don't hide CMake's output 2016-10-29 20:06:08 +02:00
Florent Castelli 24440591a8 cmake: Update FindSDL2 and use imported target 2016-10-29 19:56:30 +02:00
Florent Castelli 2152b4b500 Merge pull request #9088 from mattkanwisher/update-docs-ios 
fix ios build docs
 2016-10-24 01:36:01 +02:00
Florent Castelli 4a977d87dd Merge pull request #9085 from Orphis/android 
config: Android is a Linux too
 2016-10-20 17:56:01 +02:00
Florent Castelli 332adc456d config: Android is a Linux too 2016-10-20 17:39:47 +02:00
Florent Castelli 7ddd68de17 Merge pull request #9082 from Orphis/cmake_cleanup 
cmake: Detect features at compile time
 2016-10-19 13:05:58 +02:00
Florent Castelli 8c3552de74 cmake: Detect features at compile time 
Instead of relying on manually passed down flags from CMake,
we now have ppsspp_config.h file to create the platform defines for us.
This improves support for multiplatform builds (such as iOS).
 2016-10-19 12:31:19 +02:00
Florent Castelli 912a58d6c8 Merge pull request #9081 from Orphis/ios 
ios: Fix duplicated -arch flags in ASM files
 2016-10-18 00:45:19 +02:00
Florent Castelli 497ae685fa ios: Fix duplicated -arch flags in ASM files 2016-10-18 00:43:39 +02:00
Florent Castelli 42b46633d4 Merge pull request #9061 from Orphis/qt 
Qt updates
 2016-10-18 00:40:54 +02:00
Florent Castelli 6ab5243101 qmake: Remove! 
25% of the build systems have been removed.
 2016-10-17 23:45:22 +02:00
Florent Castelli 38ccdd2c3b travis: Build Linux/Qt with CMake 2016-10-17 23:45:22 +02:00
Florent Castelli cb4d0732df qt: Remove qrc files 2016-10-17 23:45:21 +02:00
Florent Castelli a9da49a653 qt: Remove translations as a workaround 2016-10-17 23:45:21 +02:00
Florent Castelli f02e2b59b0 qt: Build Qt frontend with CMake. Requires Qt5. 2016-10-17 23:45:21 +02:00
Florent Castelli 7bb5f99ca0 appveyor: Add initial configuration 2016-10-15 21:33:05 +02:00
Florent Castelli d78d375080 travis: Install ccache on macOS builds 2016-10-15 05:54:01 +02:00
Florent Castelli 00fb931190 Merge pull request #9072 from Orphis/macos 
travis: Enable macOS builds
 2016-10-15 05:47:10 +02:00
Florent Castelli 16eb406e36 travis: Enable macOS builds 2016-10-15 05:01:08 +02:00
Florent Castelli 5e2fc0f41c Merge pull request #9071 from Orphis/ios 
travis: Enable iOS armv7 builds
 2016-10-15 01:44:58 +02:00
Florent Castelli 49d7cddb35 travis: Enable iOS armv7 builds 2016-10-14 23:15:16 +02:00
Florent Castelli 492bda6d04 Merge pull request #9063 from Orphis/ios 
iOS and macOS toolchain fixes
 2016-10-13 18:35:45 +02:00
Florent Castelli 9623611427 osx: Specify minimum version for C files too 2016-10-13 18:16:12 +02:00
Florent Castelli b61ebea408 ios: Toolchain goes from tab to 2 spaces 2016-10-13 18:16:12 +02:00
Florent Castelli 46290ab179 ios: Target SDK 6.0 2016-10-13 18:13:44 +02:00
Florent Castelli f3dda8473f ios: Remove even more useless code from toolchain 2016-10-13 18:13:44 +02:00
Florent Castelli 27bf4c9e20 Merge pull request #9060 from Orphis/ios 
ios: Properly find the location of Xcode in toolchain
 2016-10-12 23:20:07 +02:00
Florent Castelli fdacac29fd ios: Properly find the location of Xcode in toolchain 
This was using hardcoded locations that don’t work with alternate Xcode
installations. Use “xcrun” instead to find where the SDK is.
And remove unused code.
 2016-10-12 23:13:37 +02:00
Florent Castelli 7dbd02beac Merge pull request #9059 from Orphis/ios 
cmake: iOS build fixes
 2016-10-12 22:22:21 +02:00
Florent Castelli 640764350b cmake: Fix Xcode project generation for iOS 2016-10-12 21:55:42 +02:00
Florent Castelli d861fa54a6 ios: Fix resource copying 2016-10-12 21:55:42 +02:00
Florent Castelli 05b0918e38 cmake: Merge GPU and Core targets 2016-10-12 18:52:30 +02:00
Florent Castelli d6f2c6da2b cmake: Android Studio doesn't need the output in a specific location 2016-10-12 18:52:30 +02:00
Florent Castelli 2cec77e9ec cmake: Move ccache setup to another file 2016-10-12 18:52:29 +02:00
Florent Castelli eb2eb4cd9b cmake: Move some platform configuration to a toolchain file 2016-10-12 18:52:23 +02:00
Florent Castelli 9f9e11ed25 cmake: Move modules to a sane location 2016-10-12 18:52:23 +02:00
Florent Castelli 032f3a50ea ios: Fix path to plist file 2016-10-12 18:52:23 +02:00
Florent Castelli 6b2f224d84 Merge pull request #9056 from Orphis/cmake_cleanup 
cmake: Bump requirement to version 3.6
 2016-10-12 18:46:07 +02:00
Florent Castelli fddba83081 cmake: Bump requirement to CMake 3.6 2016-10-12 18:31:49 +02:00
Florent Castelli 8fb9220154 travis: From tabs to spaces 2016-10-12 18:31:49 +02:00
Florent Castelli 210b530a8d travis: Download CMake 3.6.2 at install phase 2016-10-12 18:24:46 +02:00
Florent Castelli 94d57f4573 maemo: Remove! 2016-10-12 13:13:09 +02:00
Florent Castelli e0ff68b3f6 c++11: Remove compat header base/functional.h 
We want a proper C++11, not tr1. We don't target those compilers anyway.
 2016-10-12 11:32:45 +02:00
Florent Castelli 70593d1004 android: Change preprocessor define to standard __ANDROID__ 
ANDROID is only standard to the old Makefile buildsystem, not the platform.
 2016-10-12 11:14:09 +02:00
Florent Castelli 4145b60a0e symbian: Remove! 2016-10-11 18:49:08 +02:00
Florent Castelli 373db56a16 blackberry: Remove! 2016-10-11 17:40:32 +02:00
Florent Castelli 83aaf30207 cmake: Use preprocessor for conditional compilation in Common 
CommonExtra is gone!
Still need to fix CommonFake later though.
 2016-10-11 16:55:29 +02:00
Florent Castelli 853143e9df cmake: Fix ccache setup 2016-10-11 00:49:25 +02:00
Florent Castelli c6932e2675 Use GEPrimitiveType everywhere instead of stupid integer 2013-08-25 19:51:06 +02:00
Florent Castelli 713f4747a6 Loader: Open PBP files even if we don't find the /PSP/GAME path 2013-07-21 14:11:52 +02:00
Florent Castelli e9a261ea9d Fix path for jpgd.cpp for Android 2013-07-05 21:30:25 +02:00
Florent Castelli 8004d360dd Interrupt handler reorganization for easier GE interrupt support 2013-02-04 03:10:01 +01:00
Florent Castelli 522983549d Correctly savestate std::maps with non-uint keys. 2013-02-04 03:10:00 +01:00
Florent Castelli c37566d3bc Use proper draw sequence in PPGeDraw 2013-02-04 01:28:19 +01:00
Florent Castelli 0d54048efd setCompiledSdkVersion accepts any version as in the CFW version 2013-02-04 00:27:29 +01:00
Florent Castelli d09f58fb0e Merge pull request #387 from thefarcry118/master 
fixed GPU compiler error
 2013-01-10 00:07:55 -08:00
Florent Castelli 2463a6c860 Merge pull request #379 from thefarcry118/master 
GPUCommon iterator cleanup
 2013-01-09 13:38:55 -08:00
Florent Castelli 0daa4b5881 Merge pull request #306 from raven02/ambient-fix 
Fix ambient color in SW Transform
 2013-01-01 11:25:48 -08:00
Florent Castelli be98bad49b Merge pull request #298 from raven02/sdk-add 
Add sceKernelSetCompiledSdkVersion500_505/507
 2012-12-31 01:24:04 -08:00
Florent Castelli e258227945 Fix Headless Windows project for x64 2012-12-30 17:18:36 +01:00
Florent Castelli b9408d30bd Add gpu/displaylist/state to test list 2012-12-30 16:35:51 +01:00
Florent Castelli 2431112b39 Update pspautotests 2012-12-30 16:29:16 +01:00
Florent Castelli 36a71eafd0 Move InterpretList and ProcessDLQueue to GPUCommon 2012-12-29 03:11:36 +01:00
Florent Castelli 6eec4f5d7f Move display list management to common GPU class 2012-12-29 03:11:35 +01:00
Florent Castelli 9251bba73b Merge pull request #224 from unknownbrackets/delete-fix 
Fix sceIoRemove() on Windows infinite looping
 2012-12-22 09:21:42 -08:00
Florent Castelli a64890d3c3 Merge pull request #223 from unknownbrackets/warnings 
Revert incorrect warning fix
 2012-12-22 07:44:17 -08:00
Florent Castelli ab40b2aeef Merge pull request #119 from unknownbrackets/window-title 
Fix window title on Windows
 2012-12-04 00:58:53 -08:00
Florent Castelli edee65aeb3 Merge pull request #111 from unknownbrackets/umd-fixes 
Fix sceUmdWaitDriveStatCB()
 2012-12-02 04:52:35 -08:00
Florent Castelli 952a937fe7 Revert changes in RC file that were breaking debug build on Windows. 
If the build isn't working on VS Express, notify me so we can find a fix.
 2012-12-02 03:00:36 +01:00
Florent Castelli fd76b2bb15 Fix ordering in gpu state struct 2012-11-25 18:15:30 +01:00
Florent Castelli 2f39496ec5 Use ambient material color when no color in the vertex 
Fixes color in celshading demo
 2012-11-25 17:45:50 +01:00
Florent Castelli 4143801891 Handle depth range (zmin, zmax) in a hackish way 2012-11-25 00:15:21 +01:00
Florent Castelli 62b5bc46d0 Add glDepthRange caching 2012-11-25 00:13:08 +01:00
Florent Castelli f71d82fc6e Merge pull request #88 from unknownbrackets/texcache 
Make the texcache evict less often
 2012-11-24 11:20:04 -08:00
Florent Castelli eb6638bc8f Linux fixup 2012-11-24 17:40:08 +01:00
Florent Castelli 2680dfe10c Linux fixup 2012-11-24 17:38:19 +01:00
Florent Castelli 56175bc505 Defer blend, cull and depth test changes to draw command 
Avoid unnecessary state changes and reduces the amount of OpenGL calls.
It also puts all the interesting logic at the same place, reducing the
complexity a little.
 2012-11-24 15:19:29 +01:00
Florent Castelli 8900d99779 Add OpenGL state cache to save some redundant state change. 2012-11-24 15:19:08 +01:00
Florent Castelli fbc47cd961 Strip whitespace from test result lines 2012-11-23 18:41:46 +01:00
Florent Castelli 67d09c2c26 Tests diff the output and expected output until the end of both file 2012-11-23 18:33:40 +01:00
Florent Castelli c3635f84d3 Fix headless binary path on Linux, add shebang and exec flag to test.py 2012-11-23 17:15:38 +01:00
Florent Castelli 1968841d20 Fix Linux build 2012-11-23 17:03:51 +01:00
Florent Castelli 84f741b21d Zip reading is reserved for Android. Fixes Linux build 2012-11-23 16:58:47 +01:00
Florent Castelli 0dc3b0b566 Add a 5s timeout to tests 2012-11-20 20:29:23 +01:00