d39b457566
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
48aa076049
cmake: Fix libusb builds breaking
2020-07-10 14:02:44 +10:00
48ff15602e
cmake: pass libusb include directory as well
...
In file included from src/input_common/gcadapter/gc_adapter.cpp:8:
src/./input_common/gcadapter/gc_adapter.h:11:10: fatal error: 'libusb.h' file not found
#include <libusb.h>
^~~~~~~~~~
2020-07-09 15:26:54 +00:00
2af7e40ce6
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
f829932ed1
Fix merge conflicts?
2020-07-04 00:59:40 -04:00
b1b1ed7597
cmake: stop linking against QGL after c6a0ab9792
2020-07-01 22:11:39 +00:00
d5dfe34c49
externals: Track opus as submodule instead of using conan
...
Supersedes #4068 see for details.
2020-07-01 15:09:33 +10:00
dda90ce1c2
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
121af3646d
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
2a3d4cad63
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
104b334e40
Update CMakeLists.txt
2020-05-31 18:35:36 -04:00
0ac8848eae
Update CMakeLists.txt
2020-05-31 17:46:25 -04:00
e8baf07136
Mark the opus version check as broken.
2020-05-09 12:47:59 +02:00
bc30a591ba
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
1a2df0a5f3
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
13b02a1414
fix CMake build errors for certain SDL2 installations
2020-02-17 13:01:40 -08:00
68043dd233
use config mode for finding SDL2 with CMake
2020-02-10 19:56:33 -08:00
ac3690f205
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
dc70a36b44
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
d8bcb1e973
cmake: Add cmake option to build Boxcat backend
...
Default enabled
2019-09-30 17:26:10 -04:00
cae9708a00
Revert "CMake: Get Git submodule dependencies via CMake ( #2474 )"
...
This reverts commit 5cef446f42
2019-06-29 22:19:47 +02:00
5cef446f42
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
a6fb6ccc83
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
945e39471d
fix clang-format target when using a path with spaces on windows
2019-04-07 02:10:01 +02:00
f08db7295a
Merge pull request #2253 from lioncash/flags
...
Migrate off directly modifying CMAKE_* compilation-related flags directly
2019-03-23 13:46:53 -04:00
51f609fee7
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
13bc74e957
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
e5b004e903
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
cc94a6d101
cmake: Add Vulkan option
2019-02-12 18:33:02 -03:00
be4641c43f
gl_shader_disk_cache: Invalidate shader cache changes with CMake hash
2019-02-06 22:20:57 -03:00
15501477e7
Update Qt MSVC external to 5.12.0
2018-12-31 13:19:23 -05:00
ef4c4e239d
cmake: Add USE_QT_WEB_ENGINE flag and update build system
2018-12-28 15:32:39 -05:00
af42320021
GDBStub improvements:
...
- Add FPU support
- Fix access to TLS
Fix clang-format.
2018-11-13 15:44:20 +00:00
fc9d8afead
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
289adf87ac
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
d9ca6351dd
cmake: mingw also needs _FILE_OFFSET_BITS=64
2018-10-23 15:11:25 +02:00
c8beb665dc
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
b8b90ce6e6
Merge pull request #1332 from FearlessTobi/port-web-backend
...
Port web_service from Citra
2018-10-06 02:43:09 -04:00
fdb35760a7
string_util: unify UTF8<->UTF16 conversion to codecvt
2018-10-02 16:10:34 +02:00
ac06105dfe
Review comments -part 4
2018-10-02 15:30:49 +02:00
4d139943f2
Port web_service from Citra
2018-10-02 15:30:48 +02:00
1008be9b67
CMake: Remove superfluous CMAKE_RUNTIME_OUTPUT_DIRECTORY assignment
2018-09-25 17:55:08 +02:00
f90b75cc4c
Port citra-emu/citra#4214 : "Set citra-qt project as default StartUp Project in Visual Studio"
2018-09-22 12:24:02 +02:00
8606995515
Merge pull request #1225 from tech4me/travis-windows
...
travis: running mingw build on travis ci
2018-09-20 21:39:15 -06:00
a8f54f96fc
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
9f2bcdbb76
Update CMakeLists.txt
...
Set yuzu project as default StartUp Project in Visual Studio
2018-09-12 17:36:10 +02:00
78653f7339
Show game compatibility within yuzu
2018-08-29 15:42:53 +02:00
319dbc5843
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
eb2633f3ef
externals: Update to SDL2-2.0.8.
2018-08-12 02:42:10 -04:00
3d486fffed
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
436acbb630
CMakeLists: Change MSVC14 variable to MSVC_VERSION
...
Use of the MSVC14 variable is discouraged in the CMake documentation
(which makes sense, since MSVC_VERSION is the more general appliable
variable).
2018-08-11 19:36:21 -04:00
f437c11caf
audio_core: Implement Sink and SinkStream interfaces with cubeb.
2018-07-30 21:45:24 -04:00
0b831dd2ba
Revert "Use Ninja for MSVC AppVeyor builds" ( #584 )
2018-06-23 03:17:32 -04:00
79de0f8fe8
Drop /std:c++latest from MSVC command line
...
CMake already sets it to version 17 in all cases
2018-06-05 22:41:28 +02:00
2863e1edb9
Merge pull request #66 from RiverCityRansomware/qtUpdate
...
Updates CMakeLists to use Qt 5.10.0 instead of Qt 5.7
2018-04-02 16:06:58 -04:00
34b733e70e
CMake: Set EMU_ARCH_BITS in CMakeLists.txt
2018-03-21 19:03:20 +01:00
4cd2b475cb
Merge pull request #144 from KAMiKAZOW/patch-1
...
Install Linux icon in hicolor instead of pixmaps
2018-01-26 18:33:51 -05:00
9a005d5239
Fix typo for dependent options
2018-01-25 22:04:04 -07:00
9e41053ead
Install Linux icon in hicolor instead of pixmaps
...
hicolor is the preferred location for applications. See https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout
Same as https://github.com/citra-emu/citra/pull/3007
2018-01-26 04:00:12 +01:00
add8d40f3f
CMakeLists: Fix unicorn build for macOS developers with x86_64-only systems
...
Some of us do not have any i386 libraries required to build x86-32 universal libraries.
2018-01-21 13:59:43 +00:00
bba785d643
CMakeLists: Do not look for system Unicorn by default
...
Since we use a custom build of unicorn it doesn't make much sense to look for
the system version, unless the user explicitly wants to override this.
2018-01-21 13:58:39 +00:00
1e662e6e9a
CMake: Conditionally turn on bundled libs for MSVC
...
Removes the annoying step when generating sln for MSVC where you have to
click an extra checkbox after the first generate fails by using a
conditional option. The USE_BUNDLED options will be off by default, but
if the enable_lib option is enabled and the toolset is msvc, they are
turned ON.
2018-01-20 16:44:48 -07:00
c3e22a2f6c
CMake: Add a custom clang format target
...
Checks to see if clang-format can be found, and if it is, sets up a
custom target that will run against the src dir and auto formats all
files. In MSVC, this is a project, and in Makefiles, its a make target
2018-01-20 15:45:59 -07:00
c8a094e164
Port citra #3352 to yuzu ( #103 )
...
* Port citra #3352 to yuzu
This change allows non x86_64 architectures to compile yuzu by skipping the building of dynarmic
* Fixed clang-format errors
* fixes more clang-format errors
2018-01-19 19:36:09 -05:00
e710a1b989
CMakeLists: Derive the source directory grouping from targets themselves
...
Removes the need to store to separate SRC and HEADER variables, and then
construct the target in most cases.
2018-01-17 21:51:43 -05:00
ec204a27dc
Update qt
...
Updates qt from 5.7 to 5.10.0, fixing some errors relating to setting the process dpi
2018-01-17 09:20:53 -05:00
33778e4984
CMake: Override PYTHON environment variable for libunicorn
2018-01-16 20:05:05 +01:00
2d7a85f7af
Build: Automagically handle unicorn
...
On MSVC if unicorn isn't found, fallback to bundled unicorn
On everything else, fallback to building unicorn in externals
Also fixes loading unicorn in msvc
2018-01-16 09:39:07 -07:00
e026b66bbb
Build: Add unicorn as a submodule and build it if needed
...
Adds a cmake custom target that will build unicorn on first compile and
uses this in the build scripts as well. Updates Appveyor and Travis
build scripts to work with the new unicorn build, and updates the paths
to all of the different artifacts.
2018-01-16 01:15:52 -07:00
e9cf161917
rename CITRA to YUZU
2018-01-15 23:05:20 +01:00
67c8b671d2
Merge pull request #17 from spycrab/bindir
...
CMake: Output binaries to bin/
2018-01-15 12:56:58 -05:00
8a440faa69
CMake: Output binaries to bin/
2018-01-15 13:47:38 +01:00
554cc9488f
fixed build for gcc c++17 / boost.icl incompatibility
2018-01-14 21:48:01 -05:00
e9e511ca04
Fix compilation on case-sensitive OSX
...
When compiling on a case-sensitive filesystem on OSX, cmake doesn't find
the FindUnicorn file, because it looks for Findunicorn.cmake. We should
uses the correct case to avoid this issue.
2018-01-14 14:40:26 +01:00
c2d28351c7
Add new icons and fix up the linux paths for install
2018-01-13 15:40:57 -07:00
ebf9a784a9
Massive removal of unused modules
2018-01-12 19:11:03 -07:00
941cdae6f0
CMakeLists: Use C++ 17.
2018-01-12 19:37:23 -05:00
1b9ed033fc
cmake: Use LIBUNICORN_* on Windows.
2018-01-08 20:12:20 -05:00
f10a304ecd
fix macos build
2018-01-08 19:20:10 -05:00
738845cc0e
externals: Use unicorn DLL instead of static lib.
2018-01-04 13:15:29 -05:00
3f8b9181b5
unicorn: Use for arm interface on Windows.
2018-01-04 00:13:23 -05:00
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
40505bc4fc
Add manifest
2017-09-02 20:08:11 -04:00
f44a1e0291
common: Add build timestamp to scm_rev.
2017-08-03 20:10:37 -04:00
a08edd67eb
tests: Add tests for vadd
2017-07-23 12:29:51 +01:00
9ca6728217
CMakeLists: Check that all submodules are present
2017-07-16 19:52:05 +01:00
33b012e86b
web_service: Add CMake flag to enable.
2017-07-11 18:33:41 -04:00
6ba089fafb
Set global definition WIN32_LEAN_AND_MEAN ( #2807 )
...
Set definition WIN32_LEAN_AND_MEAN to avoid windows.h including a lot of libs that are usually not used.
2017-06-24 17:38:16 -07:00
2ef7450465
CMake: Set MSVC flags for improved C++ standards conformance
...
This makes the compiler stricter and also enables small optimizations.
2017-06-17 12:21:26 -07:00
9a08160ae5
CMake: Re-organize root CMakeLists.txt file
...
Separates the file into sections and re-orders things to fit in them
2017-05-27 23:45:55 -07:00
c211368734
CMake: Move definitions of externals to the CMakeLists in that directory
2017-05-27 23:33:14 -07:00
d736cca848
CMake: Create INTERFACE targets for microprofile and nihstro
2017-05-27 22:34:52 -07:00
74afcd5328
CMake: Add SoundTouch include path to target property
2017-05-27 22:09:28 -07:00
cb49df156d
CMake: Use target properties to add inih include paths
2017-05-27 21:59:02 -07:00
776cb91785
CMake: Define an interface target for SDL2 definitions
2017-05-27 21:38:49 -07:00
34b6c8bd88
CMake: Remove CITRA_QT_LIBS var
...
This used to be required to support both Qt4 and Qt5, but we dropped Qt4
so it's not needed anymore.
2017-05-27 20:53:39 -07:00
089baa04e8
CMake: Stop using FindOpenGL, which seems to not be required anymore
2017-05-27 20:48:00 -07:00
d6ff5c6f75
CMake: Use append instead of set to modify list
2017-05-27 20:44:51 -07:00
0f563111a2
CMake: Use IMPORTED target for Boost
2017-05-27 20:44:51 -07:00
4660bc1c78
CMake: Use IMPORTED target for libpng
2017-05-27 20:44:51 -07:00
Lioncash
David Marcec
Jan Beich
Ameer
bunnei
Markus Wick
James Rowe
Brian Clinkenbeard
fearlessTobi
Jake Merdich
Zach Hilman
Frederic L
khang06
MerryMage
ReinUsesLisp
Hedges
Weiyi Wang
spycrab
tech4me
Michał Janiszewski
N00byKing
KAMiKAZOW
River City Ransomware
Simonx22
Harry Prevor
Robin Lambertz
DaMan
B3n30
Yuri Kunde Schlesner