1
0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-19 22:01:05 +00:00
Commit Graph

77 Commits

Author SHA1 Message Date
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
vvanelslande
1437c4a01a Add MinGW CMake option to disable DWARF debugging information
Also, I disabled it for the Linux MinGW build.
2019-08-14 10:29:04 -05:00
zhupengfei
6e2d57e4ff
travis: Update the frozen build to be a flagless Debug build
This is useful to test whether Citra will compile without any CMake flags, and in Debug type.
2019-08-14 09:27:06 +08:00
zhupengfei
cf2c354fb9
CMake, CI: Add FFmpeg library dependency 2019-08-14 09:27:03 +08:00
B3n30
524ab2dca5 linux-flatpak: revert use precompiled cache 2019-04-23 23:27:14 +02:00
liushuyu
d6d8c52c96 Enable ffmpeg support on Linux FlatPak ()
* linux-flatpak: enable ffmpeg support

* linux-flatpak: fix caching for ccache
2019-04-23 23:17:37 +02:00
tkeph616
2a44abf185 Launch directly in Mac without terminal 2019-04-20 00:40:26 -04:00
Weiyi Wang
941248466b
Merge pull request 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
b1638b31a0 Change travis MinGW build from FFmpeg to WMF 2019-02-09 11:57:36 +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
Weiyi Wang
4ed9e057e8
Merge pull request from ykgmfq/patch-1
travis: update flatpak sdk to 5.12
2019-01-26 14:23:35 -05:00
ykgmfq
eda35c57cb
travis: update flatpak sdk to 5.12
Also use cmake and gcc from the sdk.
2019-01-12 15:53:45 +01: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
James Rowe
11bc9028bb
Merge pull request from liushuyu/master
travis: MinGW: minor changes
2018-12-02 01:00:58 -07:00
Pengfei Zhu
b194f238cb
Merge pull request from ccawley2011/clang-format-docker
travis: Use Docker for clang-format target
2018-12-02 07:57:42 +08:00
liushuyu
0fe4fc1db0
travis: MinGW: scan_dll: merge two scans into one 2018-11-30 19:58:23 -07:00
liushuyu
affecb68ec
travis: linux-mingw: do not install pefile...
... at the runtime
2018-11-30 19:45:28 -07:00
Pengfei Zhu
4ae977cb19
Revert "travis: Add missing flags for flatpak build" 2018-11-30 22:07:22 +08:00
Pengfei Zhu
28d089c8f3
travis: Add missing flags for flatpak build 2018-11-30 18:11:00 +08:00
Cameron Cawley
c5dcd70e38 travis: Use Docker for clang-format target 2018-11-28 15:02:43 +00:00
Jcw87
afeaaa91cb Include imageformat dependencies with releases 2018-11-17 15:27:24 +01:00
Brendan Szymanski
81cbc3fa15 Flatpak support ()
* Initial flatpak support

* Fix compatibility list directory

* Hard-code SSH mount location

* Add workaround documentation

* Change SSH repo directory

* Change SSH repo directory (again)

* Fix variable name

* Remove temporary testing branch placeholder

* Use a flatpak-specific docker image

* Enable network access during the flatpak build so we can download compatibility list the right way

* Fix flatpak tag support

* Fix typo

* Use cloned git for the build

* Change SSH repo location

* Disable shallow git cloning, needed for tagged building
2018-11-07 21:33:36 -05:00
Weiyi Wang
fc46bba4f2 CMake: disable scripting on default 2018-10-15 12:23:47 -04:00
Cameron Cawley
c220e300c5
travis: Ignore binary files when checking for trailing whitespace 2018-10-10 15:24:25 +01:00
Pengfei Zhu
c709ac0021
travis: disable scripting for transifex push job
Fixes transifex push.
2018-10-02 18:50:54 +08: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
EverOddish
04dd91be82 Initial support for scripting ()
* Add ZeroMQ external submodule

* ZeroMQ libzmq building on macOS

* Added RPC namespace, settings and logging

* Added request queue handling and new classes

* Add C++ interface to ZeroMQ

* Added start of ZeroMQ RPC Server implementation.

* Request construction and callback request handling

* Read and write memory implementation

* Add ID to request format and send reply

* Add RPC setting to macOS UI

* Fixed initialization order bug and added exception handling

* Working read-write through Python

* Update CMakeLists for libzmq to resolve target name conflict on Windows

* Platform-specific CMake definitions for Windows/non-Windows

* Add comments

* Revert "Add RPC setting to macOS UI"

* Always run RPC server instead of configurable

* Add Python scripting example. Updated .gitignore

* Rename member variables to remove trailing underscore

* Finally got libzmq external project building on macOS

* Add missing dependency during libzmq build

* Adding more missing dependencies [skip ci]

* Only build what is required from libzmq

* Extra length checks on client input

* Call InvalidateCacheRange after memory write

* Revert MinGW change. Fix clang-format. Improve error handling in request/reply. Allow any length of data read/write in Python.

* Re-organized RPC static global state into a proper class. [skip ci]

* Make sure libzmq always builds in Release mode

* Renamed Request to Packet since Request and Reply are the same thing

* Moved request fulfillment out of Packet and into RPCServer

* Change request thread from sleep to condition variable

* Remove non-blocking polling from ZMQ server code. Receive now blocks and terminates properly without sleeping. This change significantly improves script speed.

* Move scripting files to dist/ instead of src/

* C++ code review changes for jroweboy [skip ci]

* Python code review changes for jroweboy [skip ci]

* Add docstrings and tests to citra.py [skip ci]

* Add host OS check for libzmq build

* Revert "Add host OS check for libzmq build"

* Fixed a hang when emulation is stopped and restarted due to improper destruction order of ZMQ objects [skip ci]

* Add scripting directory to archive packaging [skip ci]

* Specify C/CXX compiler variables on MinGW build

* Only specify compiler on Linux mingw

* Use gcc and g++ on Windows mingw

* Specify generator for mingw

* Don't specify toolchain on windows mingw

* Changed citra.py to support Python 3 instead of Python 2

* Fix bug where RPC wouldn't restart after Stop/Start emulation

* Added copyright to headers and reorganized includes and forward declarations
2018-09-11 22:00:12 +02:00
CaptV0rt3x
b3d3cd8556 Added missing flag for discord rpc 2018-08-20 18:50:44 +05:30
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
879290aa2b travis: use prebuilt image ()
* travis: use prebuilt image

* travis: use prebuilt image (MinGW)
2018-08-07 16:54:57 +02:00
liushuyu
13049b289d
travis: add imageformats plugins (per ) 2018-07-12 09:33:57 +08:00
liushuyu
080eed7d78
travis: remove debug dlls from the final package 2018-07-12 09:33:56 +08:00
liushuyu
4cd25d115d
travis: share env vars with Docker 2018-07-12 09:33:55 +08:00
liushuyu
3a82c2eb3a
travis: only warn about missing dll (MinGW) 2018-07-12 09:33:54 +08:00
liushuyu
dfebf89cc9
travis: force increase ccache size (MinGW only) 2018-07-12 09:33:54 +08:00
liushuyu
6a8008caf2
travis: copy mediaservice plugin to support camera 2018-07-12 09:33:54 +08:00
liushuyu
15ca6550fe
travis: add essential flags to cmake cmdline
added -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
2018-07-12 09:33:53 +08:00
James Rowe
5543c9c094
Build: Change the linux-mingw upload folder to canary-mingw to match the old naming scheme 2018-07-12 09:33:53 +08:00
liushuyu
66c4b8afd9
travis: correct path to the platform plugin 2018-07-12 09:33:52 +08:00