bunnei
f01ad5b554
Merge pull request #4287 from lioncash/fmt7
...
CMakeLists: Update fmt to 7.0.1
2020-07-10 13:02:21 -04:00
Lioncash
9547973b9e
CMakeLists: Update fmt to 7.0.1
...
Keeps the package up to date with the latest major release of fmt.
This version brings in quite a bit of improvements, such as code size
reduction, etc.
2020-07-10 04:51:03 -04:00
Lioncash
24357253d8
CMakeLists: Use lower-case command names
...
Our convention uses lower-case command names, so this is just a
consistency change.
2020-07-10 01:18:40 -04:00
David Marcec
4426cfc5f7
cmake: Fix libusb builds breaking
2020-07-10 14:02:44 +10:00
Jan Beich
38bd1cc168
cmake: unbreak system libusb support
...
Reference libusb doesn't support DragonFly and FreeBSD because those
ship a different libusb implementation (supports 0.1, 1.0, 2.0 API).
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(usbi_alloc_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(usbi_alloc_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_has_capability) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_has_capability) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_has_capability) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(usbi_connect_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(usbi_disconnect_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_get_device_list) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_get_device_list) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_unref_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_unref_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_write
>>> referenced by core.c
>>> core.c.o:(usbi_signal_event) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_read
>>> referenced by core.c
>>> core.c.o:(usbi_clear_event) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_wrap_sys_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_wrap_sys_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_wrap_sys_device) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_open) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_backend
>>> referenced by core.c
>>> core.c.o:(libusb_open) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_read
>>> referenced by core.c
>>> core.c.o:(libusb_close) in archive externals/libusb/libusb.a
ld: error: undefined symbol: usbi_write
>>> referenced by core.c
>>> core.c.o:(libusb_close) in archive externals/libusb/libusb.a
ld: error: too many errors emitted, stopping now (use -error-limit=0 to see all errors)
c++: error: linker command failed with exit code 1 (use -v to see invocation)
2020-07-07 10:13:18 +00:00
Ameer
5c4f797cab
Fix merge conflicts?
2020-07-04 00:59:40 -04:00
David Marcec
2961282fae
externals: Track opus as submodule instead of using conan
...
Supersedes #4068 see for details.
2020-07-01 15:09:33 +10:00
Jan Beich
f4e850aefa
cmake: depend on WebEngine with system Qt
...
CMake Error at src/yuzu/CMakeLists.txt:7 (add_executable):
Target "yuzu" links to target "Qt5::WebEngineCore" but the target was not
found. Perhaps a find_package() call is missing for an IMPORTED target, or
an ALIAS target is missing?
2020-06-29 23:52:45 +00:00
Ameer
eddf2d0f4e
Singleton GC Adapter class, remove globals, fix naming convention
...
Fix clang formatting
Manual fix for configure_input_player formatting
Add missing lib usb cmake command
2020-06-21 21:17:07 -04:00
bunnei
4bca92c41e
externals: Revert to libressl, as build is broken with find_package(OpenSSL). ( #4093 )
...
* externals: Revert to libressl, as build is broken with find_package(OpenSLL).
* fixup! externals: Revert to libressl, as build is broken with find_package(OpenSLL).
* fixup! externals: Revert to libressl, as build is broken with find_package(OpenSLL).
2020-06-16 21:46:19 -04:00
bunnei
4b54194c1a
Update CMakeLists.txt
2020-05-31 18:35:36 -04:00
bunnei
fedee96e15
Update CMakeLists.txt
2020-05-31 17:46:25 -04:00
Markus Wick
0c788c1415
Mark the opus version check as broken.
2020-05-09 12:47:59 +02:00
James Rowe
2991e7441a
Replace externals with Conan ( #3735 )
...
* Remove git submodules that will be loaded through conan
* Move custom Find modules to their own folder
* Use conan for downloading missing external dependencies
* CI: Change the yuzu source folder user to the user that the containers run on
* Attempt to remove dirty mingw build hack
* Install conan on the msvc build
* Only set release build type when using not using multi config generator
* Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries
* Add workaround for submodules that use legacy CMAKE variables
* Re-add USE_BUNDLED_QT on the msvc build bot
2020-05-08 17:09:29 -04:00
Jan Beich
c6bd2823bb
cmake: Silence -Werror=implicit-fallthrough in SDL2 headers
...
In file included from src/input_common/sdl/sdl_impl.cpp:16:
In file included from /usr/local/include/SDL2/SDL.h:32:
In file included from /usr/local/include/SDL2/SDL_main.h:25:
/usr/local/include/SDL2/SDL_stdinc.h:445:9: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
case 3: *_p++ = _val; /* fallthrough */
^
/usr/local/include/SDL2/SDL_stdinc.h:445:9: note: insert '[[fallthrough]];' to silence this warning
case 3: *_p++ = _val; /* fallthrough */
^
[[fallthrough]];
/usr/local/include/SDL2/SDL_stdinc.h:445:9: note: insert 'break;' to avoid fall-through
case 3: *_p++ = _val; /* fallthrough */
^
break;
/usr/local/include/SDL2/SDL_stdinc.h:446:9: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
case 2: *_p++ = _val; /* fallthrough */
^
/usr/local/include/SDL2/SDL_stdinc.h:446:9: note: insert '[[fallthrough]];' to silence this warning
case 2: *_p++ = _val; /* fallthrough */
^
[[fallthrough]];
/usr/local/include/SDL2/SDL_stdinc.h:446:9: note: insert 'break;' to avoid fall-through
case 2: *_p++ = _val; /* fallthrough */
^
break;
/usr/local/include/SDL2/SDL_stdinc.h:447:9: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
case 1: *_p++ = _val; /* fallthrough */
^
/usr/local/include/SDL2/SDL_stdinc.h:447:9: note: insert '[[fallthrough]];' to silence this warning
case 1: *_p++ = _val; /* fallthrough */
^
[[fallthrough]];
/usr/local/include/SDL2/SDL_stdinc.h:447:9: note: insert 'break;' to avoid fall-through
case 1: *_p++ = _val; /* fallthrough */
^
break;
3 errors generated.
2020-04-18 23:26:22 +00:00
Brian Clinkenbeard
f2e1142067
fix CMake build errors for certain SDL2 installations
2020-02-17 13:01:40 -08:00
Brian Clinkenbeard
7a5da0dd57
use config mode for finding SDL2 with CMake
2020-02-10 19:56:33 -08:00
fearlessTobi
b2f53cceb6
Input: UDP Client to provide motion and touch controls
...
An implementation of the cemuhook motion/touch protocol, this adds the
ability for users to connect several different devices to citra to send
direct motion and touch data to citra.
Co-Authored-By: jroweboy <jroweboy@gmail.com>
2020-01-23 20:55:26 +01:00
Jake Merdich
0fa1d6dd32
Ignore git-related files in cmake for EA tarballs
...
This fixes the early-access builds on Windows (tested on EA 58). Cmake
was previously looking for git-related files that were stripped out of
the early access builds and failing; check if those exist before reading
them.
2019-12-05 22:48:20 -05:00
Zach Hilman
7c2ac91689
cmake: Add cmake option to build Boxcat backend
...
Default enabled
2019-09-30 17:26:10 -04:00
Tobias
12480d8eda
Revert "CMake: Get Git submodule dependencies via CMake ( #2474 )"
...
This reverts commit 7789dbc2f2
.
2019-06-29 22:19:47 +02:00
Frederic L
7789dbc2f2
CMake: Get Git submodule dependencies via CMake ( #2474 )
...
* CMake: Get Git submodule dependencies via CMake
* CMakeLists: Fixed unintentional line break
* travis: Bring parity between linux-mingw and linux build script
* CMakeLists: Fixed typo in error message
2019-06-19 22:26:12 -04:00
Lioncash
1f863b19f2
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-14 19:05:51 -04:00
khang06
00dd963ee6
fix clang-format target when using a path with spaces on windows
2019-04-07 02:10:01 +02:00
bunnei
25b08005a7
Merge pull request #2253 from lioncash/flags
...
Migrate off directly modifying CMAKE_* compilation-related flags directly
2019-03-23 13:46:53 -04:00
MerryMage
a977d8429d
CMakeLists: Raise minimum Boost requirement to 1.66.0
...
Required due to bugfix in boost for changed template resolving rules in GCC 7.3.0 in C++17 mode
2019-03-17 23:04:03 +00:00
Lioncash
8a5b2ec7b0
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.
2019-03-17 01:49:09 -04:00
Lioncash
b87f456d0c
CMakeLists: Remove now-unnecessary GCC special-casing
...
This issue has since been fixed in newer versions of Boost, so we don't
need to worry about this anymore.
2019-03-15 20:49:58 -04:00
ReinUsesLisp
b98f3add37
cmake: Add Vulkan option
2019-02-12 18:33:02 -03:00
ReinUsesLisp
8b1a7aa19d
gl_shader_disk_cache: Invalidate shader cache changes with CMake hash
2019-02-06 22:20:57 -03:00
Zach Hilman
3d70a73cb0
Update Qt MSVC external to 5.12.0
2018-12-31 13:19:23 -05:00
Zach Hilman
cc3d152dc7
cmake: Add USE_QT_WEB_ENGINE flag and update build system
2018-12-28 15:32:39 -05:00
Hedges
ee01a1f660
GDBStub improvements:
...
- Add FPU support
- Fix access to TLS
Fix clang-format.
2018-11-13 15:44:20 +00:00
bunnei
77c463e249
Merge pull request #1542 from lioncash/project
...
CMakeLists: Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
2018-10-23 18:44:08 -04:00
Lioncash
72ed5d12a7
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-23 12:24:43 -04:00
Weiyi Wang
307fb1cd3f
cmake: mingw also needs _FILE_OFFSET_BITS=64
2018-10-23 15:11:25 +02:00
Lioncash
62d2810fa6
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-20 17:36:31 -04:00
bunnei
21986d86ca
Merge pull request #1332 from FearlessTobi/port-web-backend
...
Port web_service from Citra
2018-10-06 02:43:09 -04:00
Weiyi Wang
365e6fdefd
string_util: unify UTF8<->UTF16 conversion to codecvt
2018-10-02 16:10:34 +02:00
fearlessTobi
cd5b9645a4
Review comments -part 4
2018-10-02 15:30:49 +02:00
fearlessTobi
92e939952c
Port web_service from Citra
2018-10-02 15:30:48 +02:00
spycrab
8931919217
CMake: Remove superfluous CMAKE_RUNTIME_OUTPUT_DIRECTORY assignment
2018-09-25 17:55:08 +02:00
fearlessTobi
8b53b7d381
Port citra-emu/citra#4214 : "Set citra-qt project as default StartUp Project in Visual Studio"
2018-09-22 12:24:02 +02:00
James Rowe
7097f11501
Merge pull request #1225 from tech4me/travis-windows
...
travis: running mingw build on travis ci
2018-09-20 21:39:15 -06:00
tech4me
a1cb3164fe
travis: running mingw build on travis ci
...
This commit also fixed a broken cmake dependency with unicorn
2018-09-19 14:22:14 -04:00
Frederic Laing
57a333eade
Update CMakeLists.txt
...
Set yuzu project as default StartUp Project in Visual Studio
2018-09-12 17:36:10 +02:00
fearlessTobi
f30bf4d48d
Show game compatibility within yuzu
2018-08-29 15:42:53 +02:00
Lioncash
3eda70284c
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-14 19:06:55 -04:00
bunnei
d381d4dc7e
externals: Update to SDL2-2.0.8.
2018-08-12 02:42:10 -04:00
Lioncash
9ab8428357
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-11 19:36:43 -04:00