midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,519 Commits 1 Branch 0 Tags 60 MiB
915c426dc9
Commit Graph

26 Commits

Author SHA1 Message Date
Hamish Milne
701cd83786 Attempt to fix mac and linux builds 2020-04-10 20:20:54 +01: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
zhupengfei
cf2c354fb9
CMake, CI: Add FFmpeg library dependency 2019-08-14 09:27:03 +08:00
Cameron Cawley
2b57d9d323 travis: Use Ninja for Travis builds 2019-02-26 00:00:26 +00:00
Weiyi Wang
008197a569 Remove scripting switch in cmake 2019-02-02 15:25:23 -05:00
Weiyi Wang
fc46bba4f2 CMake: disable scripting on default 2018-10-15 12:23:47 -04: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
liushuyu
879290aa2b travis: use prebuilt image (#3839) 
* travis: use prebuilt image

* travis: use prebuilt image (MinGW)
 2018-08-07 16:54:57 +02:00
liushuyu
6135931670
travis: share env variables with Docker 2018-06-08 02:07:13 -06:00
liushuyu
b2e3fd528b
travis: use cmake in official repository 2018-05-13 14:34:33 -06:00
朱鹏飞
57827de38b citra_qt: camera integration (#3566) 
* Implement camera feature

* Make OpenCVCamera optional

* Fix styling problems

* CI configuration

* Fix CI

* Hopefully final fix

* Hopefully final fix

* Fix all the problems

* Oops..

* Add Qt Multimedia Camera

* Another oops

* Try to fix broken linux CI

* Try to fix broken linux CI

* Fix problems

* Improve UI

* Fix problems

* camera: Add support for Qt <5.10 and fix preview error

* CI: try to fix linux-frozen travis build

* camera: fix problems and add multiple handlers support

* fix CI

* remove most ServiceFramework changes

* Fix format

* Remove last ServiceFramework change

* camera: remove unused interfaces; revert submodule change

* camera: fix CI error

* ci: use ccache for opencv build

* citra_qt: fix configuration error; CI: add mediaservice plugin

* citra_qt: fix clang-format

* citra_qt: fix documentation error

* citra_qt: fix configuration page; camera: fix pausing crash

* citra_qt: fix preview not stopping

* camera: extend handlers length

* camera: fix camera resume error

* camera: fix clang-format

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* CI: fix linux ci

* camera: check settings update; citra_qt: fix configuration error

* service_cam: use a better way to apply configuration

* Service_CAM: rewrite camera reload

* cam: fix clang format

* citra_qt: fix argument load issue; camera: base of system camera selection

* citra_qt: Add system camera selection

* camera: fix image upside down, Implement SetFrameRate in Qt Multimedia Camera

* camera: Add missing <array> include, update SetFrameRate and add settings in Qt Multimedia Camera header

* camera: move started in Qt Multimedia Camera header

* QtMultimediaCamera: Move frame rates to SetFrameRate; Set minimum and maximum frame rate

* Update appveyor.yml
 2018-05-11 11:42:23 -06:00
FearlessTobi
fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
liushuyu
0d3983bc66
travis: use mkdir -p to avoid || true 2018-04-13 20:30:04 -06:00
liushuyu
2193e9b742
travis: use cmake flags and whitespace cleanup 2018-04-13 19:10:37 -06: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
45fdcdd632 travis: An error in docker.sh should not result in success 
Closes #3022.
 2017-10-21 23:58:18 +01:00
James
e9d1e8c95b Add a subdirectory of icons for Linux builds (#3006) 2017-10-14 21:25:35 -04: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