Commit Graph

158 Commits

Author SHA1 Message Date
bunnei
517ce996bd Merge pull request #144 from KAMiKAZOW/patch-1
Install Linux icon in hicolor instead of pixmaps
2018-01-26 18:33:51 -05:00
James Rowe
aee245ee03 Fix typo for dependent options 2018-01-25 22:04:04 -07:00
KAMiKAZOW
c7193a74f5 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
MerryMage
267cbce3fe 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
MerryMage
9d7ac7617d 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
James Rowe
170a7ea5d8 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
James Rowe
0297b2c269 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
River City Ransomware
40285c4d9a 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
Lioncash
6091001deb 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
spycrab
421b774682 CMake: Override PYTHON environment variable for libunicorn 2018-01-16 20:05:05 +01:00
James Rowe
7c8ea5e44e 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
James Rowe
fea8ffa6c0 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
Simonx22
4f487d2a27 rename CITRA to YUZU 2018-01-15 23:05:20 +01:00
bunnei
ca3bc2c181 Merge pull request #17 from spycrab/bindir
CMake: Output binaries to bin/
2018-01-15 12:56:58 -05:00
spycrab
04f11ff2fb CMake: Output binaries to bin/ 2018-01-15 13:47:38 +01:00
Harry Prevor
54b1efbd61 fixed build for gcc c++17 / boost.icl incompatibility 2018-01-14 21:48:01 -05:00
Robin Lambertz
c2665b9bfb 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
James Rowe
fbf0189f45 Add new icons and fix up the linux paths for install 2018-01-13 15:40:57 -07:00
James Rowe
8f0a03a606 Massive removal of unused modules 2018-01-12 19:11:03 -07:00
bunnei
272ac52114 CMakeLists: Use C++ 17. 2018-01-12 19:37:23 -05:00
bunnei
546b92e95d cmake: Use LIBUNICORN_* on Windows. 2018-01-08 20:12:20 -05:00
MerryMage
2fd6ff0dba fix macos build 2018-01-08 19:20:10 -05:00
bunnei
e158da6562 externals: Use unicorn DLL instead of static lib. 2018-01-04 13:15:29 -05:00
bunnei
685c8610dc unicorn: Use for arm interface on Windows. 2018-01-04 00:13:23 -05:00
James Rowe
1cbc44a6c5 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
DaMan
81aa4e612a Add manifest 2017-09-02 20:08:11 -04:00
bunnei
d10b614924 common: Add build timestamp to scm_rev. 2017-08-03 20:10:37 -04:00
MerryMage
9a05e1960b tests: Add tests for vadd 2017-07-23 12:29:51 +01:00
MerryMage
c3be9dddea CMakeLists: Check that all submodules are present 2017-07-16 19:52:05 +01:00
bunnei
6c8c5bbcb7 web_service: Add CMake flag to enable. 2017-07-11 18:33:41 -04:00
B3n30
ecd2f34088 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
Yuri Kunde Schlesner
911e827fcc 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
Yuri Kunde Schlesner
f7d2793dc6 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
Yuri Kunde Schlesner
2eac434224 CMake: Move definitions of externals to the CMakeLists in that directory 2017-05-27 23:33:14 -07:00
Yuri Kunde Schlesner
68842aab33 CMake: Create INTERFACE targets for microprofile and nihstro 2017-05-27 22:34:52 -07:00
Yuri Kunde Schlesner
03574d12b5 CMake: Add SoundTouch include path to target property 2017-05-27 22:09:28 -07:00
Yuri Kunde Schlesner
298bbbd851 CMake: Use target properties to add inih include paths 2017-05-27 21:59:02 -07:00
Yuri Kunde Schlesner
bd753b8131 CMake: Define an interface target for SDL2 definitions 2017-05-27 21:38:49 -07:00
Yuri Kunde Schlesner
53a71b3080 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
Yuri Kunde Schlesner
e2b17357e2 CMake: Stop using FindOpenGL, which seems to not be required anymore 2017-05-27 20:48:00 -07:00
Yuri Kunde Schlesner
e16d434483 CMake: Use append instead of set to modify list 2017-05-27 20:44:51 -07:00
Yuri Kunde Schlesner
896bb090ec CMake: Use IMPORTED target for Boost 2017-05-27 20:44:51 -07:00
Yuri Kunde Schlesner
dce4bda619 CMake: Use IMPORTED target for libpng 2017-05-27 20:44:51 -07:00
Yuri Kunde Schlesner
70a10c8a1c Add the fmt string formatting library
More info at http://fmtlib.net/

This commit was based on @jroweboy's work on his spdlog branch, but with
modifications.
2017-05-27 14:26:02 -07:00
Fernando Sahmkow
1f6e415640 Fix Microprofile in MinGW (#2530) 2017-02-04 15:36:38 -08:00
Kloen
c1369b02f3 Removed unused and outdated external qhexedit 2017-01-22 18:46:48 +01:00
James Rowe
496deed8e0 Change deploy to use github releases instead, but only for the citra-nightly repo 2017-01-04 20:53:46 -07:00
James Rowe
ab168f00c9 Add deploy to bintray for builds to master 2016-12-31 13:54:51 -05:00
bunnei
e7bc63fe1e Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll
Copy SDL2.dll when compiling citra-qt with msvc
2016-12-16 11:35:55 -05:00
Yuri Kunde Schlesner
d3c6c5a381 Externals: Add Xbyak 2016-12-14 20:06:08 -08:00