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

213 Commits

Author SHA1 Message Date
Hamish Milne
da3ab3d56e Merge branch 'master' into feature/savestates-2 2020-03-07 21:23:08 +00:00
liushuyu
cff00f38c5
Implements fdk_aac decoder ()
* audio_core: dsp_hle: implements fdk_aac decoder

* audio_core: dsp_hle: clean up and add comments

* audio_core: dsp_hle: move fdk include to cpp file

* audio_core: dsp_hle: detects broken fdk_aac...

... and refuses to initialize if that's the case

* audio_core: dsp_hle: fdk_aac: address comments...

... and rebase commits

* fdk_decoder: move fdk header to cpp file
2020-02-23 11:01:21 +01:00
Hamish Milne
f2de70c3fb Fix crash bugs 2020-02-13 17:42:06 +08:00
Hamish Milne
754f63af1a Don't require cmake 3.15 2020-02-13 17:41:21 +08:00
Hamish Milne
9877bf7d48 Change how the boost target works; disable external warnings in MSVC 2020-02-13 17:41:20 +08:00
Hamish Milne
a0ac302a93 Definitely disable using system boost if version doesn't match 2020-02-13 17:41:20 +08:00
Hamish Milne
d041901a30 Some more CI fixes 2020-02-13 17:41:20 +08:00
Hamish Milne
6940c99ed6 Added boost serialization 2020-02-13 17:27:50 +08:00
zhupengfei
977ccda30f
CMakeLists: Fix find_package call
Fixes 

Previously options for video dumper and audio decoder is separated, but I forgot to split this `find_package` call so that the other libraries won't be necessary when only using the audio decoder.
2019-10-03 09:35:08 +08:00
zhupengfei
609bd71da3
Fix dependent options 2019-08-20 15:26:59 +08: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
cf2c354fb9
CMake, CI: Add FFmpeg library dependency 2019-08-14 09:27:03 +08:00
Tobias
a11bc03d4a
Port yuzu-emu/yuzu#2253: "Migrate off directly modifying CMAKE_* compilation-related flags directly" ()
* CMakeLists: Move compilation flags into the src directory

We generally shouldn't be hijacking CMAKE_CXX_FLAGS, etc as a means to
append flags to the targets, since this adds the compilation flags to
everything, including our externals, which can result in weird issues
and makes the build hierarchy fragile.

Instead, we want to just apply these compilation flags to our targets,
and let those managing external libraries to properly specify their
compilation flags.

This also results in us not getting as many warnings, as we don't raise
the warning level on every external target.

* CMakeLists: Move off of modifying CMAKE_*-related flags

Modifying CMAKE_* related flags directly applies those changes to every
single CMake target. This includes even the targets we have in the
externals directory.

So, if we ever increased our warning levels, or enabled particular ones,
or enabled any other compilation setting, then this would apply to
externals as well, which is often not desirable.

This makes our compilation flag setup less error prone by only applying
our settings to our targets and leaving the externals alone entirely.

This also means we don't end up clobbering any provided flags on the
command line either, allowing users to specifically use the flags they
want.
2019-06-18 12:12:32 +02:00
Lioncash
7b3c4b05c6 CMakeLists: Handle VS 2019 in a less annoying manner
VS 2019 is binary compatible with VS 2017, so we can safely use
the prebuilt libraries for VS 2017 with VS 2019. This makes it less
annoying to build yuzu with the most up to date toolchain.
2019-05-19 18:29:58 +02:00
khang06
7842decde6 fix clang-format target when using a path with spaces on windows 2019-04-02 21:02:43 -04: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
liushuyu
8fe3e37df5 audio_core: fix msvc include issue 2019-02-09 11:55:12 +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
BreadFish64
6609ff83a7 android: set up cmake 2018-11-20 14:24:19 -05:00
Weiyi Wang
724b458a83
Merge pull request from FearlessTobi/port-1553
Port : "common: Remove memory_util.h/.cpp"
2018-10-26 22:38:18 -04:00
Lioncash
9f6c1b058a CMakeLists: Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
This is more localized to what we want to enforce directory-wise with
the project. CMAKE_SOURCE_DIR indicates the root of the source tree, but
this would cause the wrong behavior if someone included yuzu as part of
a larger buildsystem (for whatever reason). Instead, we want to use the
directory where the "project(yuzu)" command was declared as the root
path reference.
2018-10-27 00:20:52 +02:00
Lioncash
24b931eca1 CMakeLists: Remove EMU_ARCH_BITS definition
This was only ever used by the now-removed memory_util functions. Also,
given we don't plan to support 32-bit architectures, this is just a
leftover from citra at this point.
2018-10-26 23:40:08 +02:00
Weiyi Wang
57ce5079bc
Merge pull request from wwylele/file-util-mingw
Only redefine some 64-bit file operation for MSVC
2018-10-21 20:34:48 -04:00
fearlessTobi
9901b289b6 Review comments -part 4 2018-10-20 10:35:55 -04:00
Weiyi Wang
380b83e9bd cmake: mingw also needs _FILE_OFFSET_BITS=64 2018-10-16 13:23:07 -04:00
Weiyi Wang
fc46bba4f2 CMake: disable scripting on default 2018-10-15 12:23:47 -04:00
bunnei
4a5a97ab88
Merge pull request from wwylele/string-util-cleanup
common/string_util cleanup
2018-10-01 17:52:58 -04:00
Weiyi Wang
1f9f220a3e
Merge pull request from EverOddish/master
Added CMake option to enable/disable scripting support
2018-09-25 22:57:07 -04:00
EverOddish
86ea9d3b1b Adding description to CMake option 2018-09-25 21:13:02 -04:00
spycrab
fb3af43444 cmake: Output binaries to bin on every platform 2018-09-24 16:36:14 +02:00
EverOddish
fce7afb8dc Added CMake option to enable/disable scripting support 2018-09-23 19:16:18 -04:00
Weiyi Wang
e087cb9a28 string_util: unify UTF8<->UTF16 conversion to codecvt 2018-09-22 17:23:48 -04:00
Frederic Laing
d8f09f69eb Addressed feedback 2018-09-21 14:48:55 +02:00
Frederic Laing
596700cb3a Merge branch 'citra-qt-startup-project' of https://github.com/FreddyFunk/citra into citra-qt-startup-project 2018-09-21 14:48:00 +02:00
Frederic Laing
c4bf626b88 Addressed feedback 2018-09-21 14:47:43 +02:00
Frederic Laing
cc3404a097 Set citra-qt project as default StartUp Project in Visual Studio
Set citra-qt project as default StartUp Project in Visual Studio
2018-09-21 14:46:20 +02:00
Frederic L
d26b363562
Set citra-qt project as default StartUp Project in Visual Studio
Set citra-qt project as default StartUp Project in Visual Studio
2018-09-14 02:27:33 +02:00
Weiyi Wang
2396e58ee4
Merge pull request from FearlessTobi/port-stupid-fixes
citra_qt: Backport some review fixes of Lioncash
2018-09-04 01:47:03 +03:00
fearlessTobi
2f6f232965 Backport some review fixes of Lioncash 2018-09-01 15:41:46 +02:00
Pengfei Zhu
3b3b0bbdf5
Merge pull request from citra-emu/port-1030
Port  from yuzu: "externals: Update to SDL2-2.0.8"
2018-09-01 12:08:13 +08:00
Tobias
c8bcd35b7a
Port from yuzu: "externals: Update to SDL2-2.0.8" 2018-09-01 08:12:06 +08:00
Lioncash
ce472144ff CMakeLists: Add architecture detection for AArch64
We already have an equivalent in place for the 32-bit ARM architecture, so we
should also have one for the newer 64-bit ARM architecture as well.
2018-08-31 00:07:01 +02:00
Merry
b49d042200
Merge pull request from Hedges/GDBClean
GDB Modernization
2018-08-25 13:58:38 +01:00
Merry
c292a9e2f5
Merge pull request from zhaowenlan1779/port-yuzu-922
Port "CMakeLists: Change MSVC14 variable to MSVC_VERSION" from yuzu
2018-08-24 19:14:51 +01: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
Jarek Syrylak
bd658a8801 GDB Modernization:
- Can be used in either DynCom or Dynarmic mode
- Added support for threads
- Proper support for FPU registers
- Fix for NibbleToHex conversion that used to produce false error codes
- Fix for clang-format failing under Windows
2018-08-16 10:40:52 +01:00
Lioncash
f5ddcef340 CMakeLists: lowercase find_library usage
The rest of the CMake script uses lowercase for commands (which is the
general CMake style), making it more consistent with surrounding code.
2018-08-12 13:39:22 +08:00