Commit Graph

20843 Commits

Author SHA1 Message Date
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
Henrik Rydgård
705627d6d3 Merge pull request #9053 from Orphis/android_define
android: Change preprocessor define to standard __ANDROID__
2016-10-12 13:12:14 +02:00
Henrik Rydgård
0ae3c9cf34 Merge pull request #9054 from Orphis/cpp11
c++11: Remove compat header base/functional.h
2016-10-12 13:11:36 +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
Henrik Rydgård
4f655f8f3c Merge pull request #9051 from Orphis/symbian_remove
symbian: Remove!
2016-10-11 18:50:59 +02:00
Florent Castelli
4145b60a0e symbian: Remove! 2016-10-11 18:49:08 +02:00
Henrik Rydgård
ad71d27809 Merge pull request #9045 from Orphis/cmake_cleanup
cmake: Use preprocessor for conditional compilation in Common
2016-10-11 18:19:22 +02:00
Henrik Rydgård
02d26279b7 Merge pull request #9050 from Orphis/blackberry_remove
blackberry: Remove!
2016-10-11 18:02:48 +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
Henrik Rydgård
fef8847a58 Merge pull request #9044 from unknownbrackets/powersave
Tweak wording to clarify battery save message
2016-10-11 08:26:15 +02:00
Henrik Rydgård
fb31d3612f Merge pull request #9047 from unknownbrackets/blackberry
Remove Blackberry support from CMake
2016-10-11 08:25:57 +02:00
Henrik Rydgård
de0934e4c8 Merge pull request #9048 from unknownbrackets/vulkan-swap
Vulkan: Correct initial swapchain compositeAlpha
2016-10-11 08:25:33 +02:00
Unknown W. Brackets
1d9222b3e4 Vulkan: Add comment for Android validation layers.
Note: these also require minor tweaks to Local.mk to include, currently,
but we're probably moving to gradle.
2016-10-10 22:08:44 -07:00
Unknown W. Brackets
e263bb945e Vulkan: Correct initial swapchain compositeAlpha.
We'll just need to deal with the fact that we have to output 1.0 so that
blending doesn't matter, I think.
2016-10-10 22:07:50 -07:00
Henrik Rydgard
f6ebedba78 Fix some build errors. 2016-10-10 22:01:20 -07:00
Henrik Rydgard
c40e507f3d Get rid of some blackberry build stuff
Conflicts:
	CMakeLists.txt
2016-10-10 21:58:54 -07:00
Unknown W. Brackets
379ec56f0d Tweak wording to clarify battery save message. 2016-10-10 17:32:25 -07:00
Unknown W. Brackets
ed41af41d0 Merge pull request #9043 from Orphis/ccache
cmake: Fix ccache setup
2016-10-10 15:54:27 -07:00
Florent Castelli
853143e9df cmake: Fix ccache setup 2016-10-11 00:49:25 +02:00
Henrik Rydgård
ba2789974e Merge pull request #9042 from unknownbrackets/android
Undo arm64 fix: was a local problem, after all
2016-10-10 09:09:27 +02:00
Unknown W. Brackets
5ab0db2cd3 Undo arm64 fix: was a local problem, after all. 2016-10-09 20:40:00 -07:00
Henrik Rydgård
d4ab4052f8 Merge pull request #8935 from hrydgard/kubridge
Partially implement KUBridge, trying to help #8925.
2016-10-09 12:40:55 +02:00
sum
5a224d1601 Build fix for non-windows 2016-10-09 12:40:40 +02:00
Henrik Rydgard
d3305b88b9 Partially implement KUBridge, trying to help #8925. However, it doesn't even call the function.... Odd. 2016-10-09 12:40:40 +02:00
Henrik Rydgård
c78dcb4c54 Merge pull request #9039 from unknownbrackets/vulkan
Android lost/restore prep work for Vulkan
2016-10-08 21:42:18 +02:00
Unknown W. Brackets
5641d18eb9 Correctly call Restore in C++ EGL path.
This will be needed for Vulkan.
2016-10-08 12:35:01 -07:00
Unknown W. Brackets
a8e108e233 Workaround arm64/clang crashes by avoiding TLS.
We only use it in these two places, it should be okay for now.  Still not
working on r13 on a SHIELD TV.
2016-10-08 12:08:19 -07:00
Henrik Rydgård
55c9838132 Merge pull request #9037 from unknownbrackets/powersave
Fix Touchwiz power saving detection on S5 and newer
2016-10-08 19:38:23 +02:00