lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-28 22:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
8795 commits 7 branches 3 tags 148 MiB
Commit graph

32 commits

Author SHA1 Message Date
Marshall Mohror 897e473da4
Merge pull request #5332 from Dragios/fix-exe-path 
Correct output paths for executable binaries in CMakeLists.txt
 2020-07-14 09:10:11 -05:00
Dragios 841522f59c Try to fix executable path generated in CI 2020-05-04 22:35:20 +08:00
MerryMage 1f375f2511 travis: Compile on macOS 10.13 with more up to date compiler 2020-05-02 08:50:42 +01:00
James Rowe ea482a719d OSX Build: Remove ninja 
Ninja on OSX lately is giving an error where it gets in a cmake
reconfiguration loop. It constantly reruns cmake and detects that the
build file changed, so it reruns it again and again until it times out.
Not going to deal with this right now.
 2020-01-21 18:54:05 -07:00
James Rowe f70262a7e0
Attempt to fix macOS build 2020-01-15 10:19:40 -07:00
James Rowe 767b49c552 testing ninja on macos travis 2019-11-27 17:18:47 -07:00
zhupengfei f8b3950829
CMake: separate options for FFmpeg decoder/dumper 
Separate options are now provided for FFmpeg AAC audio decoder and FFmpeg video dumper. This allows users to configure Citra with greater freedom.

Also, previously for Linux builds, AAC decoder is accidentally enabled along with the dumper, which could potentially cause patent issues (?). This commit fixes it by only enabling video dumper.
 2019-08-20 14:45:39 +08:00
tkeph616 2a44abf185 Launch directly in Mac without terminal 2019-04-20 00:40:26 -04:00
Weiyi Wang 941248466b
Merge pull request #4125 from ccawley2011/travis-ninja 
travis: Use Ninja for Travis builds
 2019-03-23 23:15:00 -04:00
Alex James d299d0ed65
travis/macos: Use macpack to bundle dependencies 
This appears to properly handle the ffmpeg libraries that dylibbundler
failed to patch.
 2019-03-11 22:21:17 +08:00
Cameron Cawley 2b57d9d323 travis: Use Ninja for Travis builds 2019-02-26 00:00:26 +00:00
Alex James e363f568ef
travis/macos/upload: Don't hardcode ffmpeg/libvorbis versions 2019-02-17 13:06:31 -06:00
B3N30 6737fabb3c update ffmpeg path to new version 2019-02-11 22:49:27 +01:00
B3N30 bd9984b5f8 Addressed reviews 2019-02-09 11:55:12 +01:00
B3N30 c521f3b7d6 CoreAudio::HLE: Add FFmpeg aac decoder 2019-02-09 11:52:31 +01:00
Weiyi Wang 008197a569 Remove scripting switch in cmake 2019-02-02 15:25:23 -05:00
MerryMage 22e4a2b901 travis/macos/upload: Manually invoke install_name_tool for a few stragglers 2018-12-28 10:43:54 +00:00
MerryMage e949314e65 travis: Simplify macos/upload.sh 2018-12-17 15:53:15 +00:00
Weiyi Wang fc46bba4f2 CMake: disable scripting on default 2018-10-15 12:23:47 -04:00
B3n30 89a8cfcf2b OSX: Set MACOSX_DEPLOYMENT_TARGET to 10.13 2018-09-27 09:10:00 -03:00
spycrab fb3af43444 cmake: Output binaries to bin on every platform 2018-09-24 16:36:14 +02:00
Vamsi Krishna 6cb9a45154 Add Discord Rich Presence Support (#3883) 
* Initial Discord RPC support

Build with Discord Presence ON

Fix RPC detection

Fix Time elapsed on pause; will now continue to count.

* Fix CI builds with compile flag

Addressed reviews

Fix silly mistakes

Fix 'Not in-game' display

class instead of namespace

Fix

Revamped

remove redundant code

Using Pimpl pattern

* Implement Null class

* Fix config updation

* Addressed All Reviews

* externals/discord-rpc : Updated to latest commit
 2018-08-20 11:20:33 +02:00
FearlessTobi fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
liushuyu 16981d6be4 travis: use cache 2018-04-13 19:10:20 -06:00
James 9283053701 Move WebServices to use LibreSSL + cpp-httplib (#3501) 
Move WebServices to use LibreSSL + cpp-httplib

Remove curl + openssl build dependencies
 2018-03-24 13:19:35 -06:00
B3n30 d4cc0d8148 Fix path for travis upload 2018-03-09 19:11:32 +01:00
B3n30 b3cdf30c65 fixup! Network: Added an executable to host an dedicated room for local wifi 2018-03-09 19:11:32 +01:00
MerryMage ce31cf531d CI: Update to C++17 and use Ubuntu 18.04 as baseline 2018-02-06 17:02:21 +00:00
BreadFish64 c3afd73592
Merge branch 'master' into CompatibiltyReporting 2018-01-18 10:36:32 -06:00
BreadFish64 e768a92587 add compatibility reporting to qt frontend 2018-01-01 19:25:38 -06:00
wwylele 798a1c6ae9 Travis, Appveyor: build with languages 2017-12-16 13:11:05 +02:00
MerryMage 15a2388a33 travis: Split build scripts for different platforms 
This commit also separates clang-format from the linux build, closing #2702.
 2017-10-07 12:10:03 +01:00