Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-04 12:37:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,872 Commits 78 Branches 122 Tags
Commit Graph

20872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Henrik Rydgård
789dc2fe49 Merge pull request #9079 from Orphis/appveyor 
appveyor: Add initial configuration
 2016-10-15 22:30:44 +02:00
Florent Castelli
7bb5f99ca0 appveyor: Add initial configuration 2016-10-15 21:33:05 +02:00
Unknown W. Brackets
423906cb63 Merge pull request #9077 from Orphis/macos 
travis: Install ccache on macOS builds
 2016-10-14 22:36:33 -07: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
Henrik Rydgård
6d9074239e Merge pull request #9070 from hrydgard/assets-reorg 
Assets reorg
 2016-10-14 23:48:23 +02:00
Henrik Rydgård
6cee9429cc Qt lang buildfix 2016-10-14 23:18:34 +02:00
Florent Castelli
49d7cddb35 travis: Enable iOS armv7 builds 2016-10-14 23:15:16 +02:00
Henrik Rydgard
f7a983a632 Attempt linux buildfix 2016-10-14 22:46:01 +02:00
Henrik Rydgard
486963487b Move unix-icons out of assets 2016-10-14 22:38:33 +02:00
Henrik Rydgard
c87d4a66c1 Move lang into assets. 2016-10-14 22:33:45 +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
Henrik Rydgård
a141ee3bf4 Merge pull request #9058 from adenovan/ptp 
ptp connect fix solved #8983 for android with high latency
 2016-10-12 19:31:27 +02:00
Ade Novan
ff0e3c28b4 ptp connect fix solved #8983 for android with high latency 2016-10-13 01:21:24 +08:00
Henrik Rydgård
eb7caacd6a Merge pull request #9057 from Orphis/cmake_cleanup 
cmake: Extract some platforms to proper toolchain files
 2016-10-12 19:19:37 +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
Henrik Rydgård
2b67db27f9 Merge pull request #9055 from Orphis/maemo_remove 
maemo: Remove!
 2016-10-12 14:43:49 +02:00
Florent Castelli
94d57f4573 maemo: Remove! 2016-10-12 13:13:09 +02:00