1
0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-28 12:40:04 +00:00
Commit Graph

80 Commits

Author SHA1 Message Date
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
James Rowe
fa6b5709a7
Merge pull request from zhaowenlan1779/appveyor-broken-again
Fix appveyor mingw (partially)
2019-08-14 09:29:53 -06:00
Pengfei Zhu
e008585195
Added a HACK to ignore errors
Cyclical dependencies will result in errors. Redirecting err to null
doesn't help. I removed the redirection so that errors and warnings
would show up (they might be useful for us).

As FFmpeg is added, even more cyclical dependencies are present now. I
do not want to figure out what to install first to fix such things, so I
just decided to ignore all of them with a `0` at the end.
2019-08-14 16:29:42 +08:00
Pengfei Zhu
9463e13f5a
Unfreeze CMake version
The original purpose of freezing CMake is to use a **higher** version than supplied in order to fix a certain issue. Now that a very long time has passed and mingw's CMake has been updated, there's really no reason to still freeze it any more. What's more, trying to use a certain version is unreliable by pacman's design and will probably cause issues for using older versions of dependencies. The current (and previous) mingw errors may come from this...
2019-08-14 16:28:28 +08:00
zhupengfei
cf2c354fb9
CMake, CI: Add FFmpeg library dependency 2019-08-14 09:27:03 +08:00
B3N30
80b4dd21d2 audio_core: dsp_hle: add Media Foundation decoder...
* appveyor: switch to Media Foundation API
* Travis CI MinGW build needs an update with the container image
2019-02-09 11:56:51 +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
Jcw87
7947c81eaa Include imageformat dependencies with releases (appveyor) 2018-11-17 16:36:56 +01:00
Pengfei Zhu
008242c5f3 appveyor: fix mingw build ()
* Try to manually overwrite

* Update appveyor.yml

* Update appveyor.yml

* what about don't overwrite?

* what if only syyu once?

* still need to syyu twice it seems

* add comment as well as trigger rebuild

what happened to msvc

* it seems that I can just remove the -Syy
2018-10-05 10:58:33 -04:00
Vamsi Krishna
6cb9a45154 Add Discord Rich Presence Support ()
* 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
d0c5121dc4
appveyor: disable deploy to GitHub 2018-07-12 09:33:39 +08:00
zhupengfei
c52e0cdfa8
CI: add imageformats plugins 2018-06-28 22:53:23 +08:00
liushuyu
2cecb3bd6e
appveyor: fix mingw issue (again) 2018-06-08 21:13:51 -06:00
朱鹏飞
57827de38b citra_qt: camera integration ()
* 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
朱鹏飞
590a09d004 CI: Add qwindowsvistastyle.dll () 2018-05-05 22:39:07 -06:00
FearlessTobi
fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
Valentin Vanelslande
b2a28a24d0
appveyor: set jobs to 4 for mingw 2018-03-31 16:30:02 -06:00
MerryMage
75fa1b2cde appveyor: Generate PDBs for mingw build 2018-03-27 11:57:34 +01:00
James
9283053701 Move WebServices to use LibreSSL + cpp-httplib ()
Move WebServices to use LibreSSL + cpp-httplib

Remove curl + openssl build dependencies
2018-03-24 13:19:35 -06:00
BreadFish64
c3afd73592
Merge branch 'master' into CompatibiltyReporting 2018-01-18 10:36:32 -06:00
James Rowe
e1ffcde355
Merge pull request from wwylele/translation-tx
citra-qt: add translation support; link translation with transifex
2018-01-18 09:01:00 -07:00
Yuri Kunde Schlesner
b4471aafa2
Merge pull request from MerryMage/appveyor
appveyor: Determine dlls to include in package programmatically
2018-01-02 21:27:59 -08: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
B3n30
4f13d6f665 Appveyor: on mingw set cmake version to 3.9.6 ()
Appveyor: on mingw set cmake version to 3.9.6
2017-11-20 10:39:31 -05:00
Flame Sage
c41f19224d
Added Webhook notifications for Appveyor. 2017-11-17 01:43:06 +00:00
MerryMage
70523f68c9 appveyor: Determine dlls to include in package programmatically
This is done by recursively calling bindump to determine the dependencies
of each binary that is required from each of the executables. Doing this
allows us to avoid hard-coding a list of required DLL files to copy into
the release archives.
2017-10-26 06:02:13 +01:00
James Rowe
26065fd872 Merge pull request from Hexagon12/sdl2-sound-fix
Workaround for SDL2 2.0.6 audio issues
2017-10-24 20:40:38 -06:00
Hexagon12
6a5a836409 Updated the AppVeyor script with a stable SDL2 link. 2017-10-24 21:09:41 +03:00
Valentin Vanelslande
e2dcd1776f fix dll error 2017-10-23 13:20:16 -05:00
James Rowe
9e847b7549 Build: Enable SSL in mingw by linking against WinSSL
The mingw builds aren't submitting telemetry because the curl library
they are linked against is configured to use openSSL and openSSL looks
for the certificates in the users home folder. This keeps it from
contacting web services because it can't communicate over SSL.

This commit adds a download in mingw builds that will download a
precompiled curl for mingw linked against winssl and sspi.
2017-09-11 09:10:17 -06:00
James Rowe
ef8925b7ac Remove excess debug dlls for mingw build 2017-09-05 18:57:47 -06:00
James Rowe
ab47bf6ad6 Build: Add mingw64 compile support to appveyor
Releases will be built with both mingw and msvc and the binaries of both
builds will be uploaded to github releases
2017-09-01 07:56:36 -06:00
j-selby
80f85b429c Implement correct folder structure for CI builds 2017-08-10 17:40:56 +10:00
j-selby
8bda0ca68d Travis/AppVeyor: Deploy based upon tags 2017-08-06 19:07:29 +10:00
j-selby
a7dae7fd70 Produce 7zip artifacts on Travis and Appveyor 2017-07-28 14:22:43 +10:00
James Rowe
0f81e18793 Use WinSSPI instead of OpenSSL
Appveyor has OpenSSL installed, so cURL tries to link against it.
This causes dll not found errors because we would also need to ship
OpenSSL, so we link against Windows SSPI instead.
2017-07-24 09:56:44 -06:00
Yuri Kunde Schlesner
6c26b6efbc Remove "Xamarin logspam" workaround
The file does not seem to exist anymore in the VS 2017 environment.
2017-05-21 15:59:11 -07:00
Yuri Kunde Schlesner
eb8afab865 Upgrade AppVeyor to Visual Studio 2017
More C++14/17 goodness!
2017-05-21 15:56:25 -07:00
Kloen
d6fc0bdc75 appveyor: workaround for unnecesary Xamarin log spam 2017-01-23 12:06:55 +01:00
James Rowe
84c6a98374 Prevents appveyor from attempting to deploy except on the nightly repo 2017-01-08 11:17:44 -07:00
James Rowe
c4ad608870 Change travis to deploy on push to citra-nightly. Add more information to the releases page 2017-01-04 21:31:40 -07:00
James Rowe
0a6ca01991 Change deploy to use github releases instead, but only for the citra-nightly repo 2017-01-04 20:53:46 -07:00
James Rowe
8f6c3b5c20 Try a different encrypted bintray api key for travis. Change appveyor to upload to a long git hash (since travis is stuck uploading to the full hash name) 2016-12-31 23:38:15 -05:00
James Rowe
4a6cf7ecaf Trying to make a consistent nightly versioning 2016-12-31 19:37:21 -05:00
James Rowe
b03e7bf28f Add deploy to bintray for builds to master 2016-12-31 13:54:51 -05:00
James Rowe
93bcd00e44 Create a separate archive for debugsymbols on windows
This reduces the main download size and uploads the symbols to a different
directory
2016-09-01 10:47:31 -06:00
MerryMage
d3619aaff3 appveyor: Remove tests.exe and tests.pdb from archive 2016-09-01 14:41:24 +01:00
Jannik Vogel
ac6853c585 AppVeyor: Cache chocolatey packages 2016-08-29 15:19:50 +02:00