piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,308 Commits 5 Branches 11 Tags 1.3 GiB
384e044437
Commit Graph

732 Commits

Author SHA1 Message Date
degasus
239cde8aea Externals: Alter the soundtouch include directory. 
We must not provide the /Externals directory as global include directory.
Here, this yield a crash because of external minizip header and system library mismatch.

Soundtouch itself recormends to include it with <SoundTouch.h> and -I/usr/include/soundtouch, so this should fit better.
 2020-04-29 11:30:26 +02:00
Techjar
d5f356f937 Require minizip 2.0.0 or newer 
Minizip 1.x is the old broken version, while 2.x is the newer fork we
use. Many distros ship the old version which is causing stack smashing
in RedumpVerifier, so we'll only use the shared lib if it's the newer
version.
 2020-04-28 20:42:02 -04:00
degasus
9fd03cda9d Externals: Add libLZMA. 2020-04-24 15:18:09 +02:00
degasus
4385afdb0a Externals: Add bzip2. 2020-04-24 15:18:09 +02:00
Léo Lam
5db7add9c7
Merge pull request #8667 from Mystro256/master 
Allow for some shared minizip/fmt
 2020-03-15 16:25:11 +01:00
mazes-80
209db1f96c Build system: default to fmt shared library when available 2020-03-15 14:30:44 +01:00
Mystro256
9f12e0f5a9 Allow using shared minizip 2020-03-11 10:55:05 -04:00
spycrab
213a9adcff CMake: Fix building ARM64 on Windows 2020-02-12 12:29:31 +01:00
Connor McLaughlin
ae6d3be449
Merge pull request #8530 from s-daveb/master 
MacOS: Fixes configuration hang; bump MacOS SDK.
 2020-01-13 20:21:08 +10:00
Stenzek
5a65031611 Add a Win32 NoGUI platform and project 2019-12-28 08:56:27 +10:00
S David
21f42fafb7 MacOS: Fixes configuration hang; bump MacOS SDK. 
Removed conditional use of std::mutex instead of std::shared_mutex on MacOS.

Because MacOS < 10.12 did not support std::shared_mutex, a previous commit
naïvely substituted std::mutex, which does not have the same behavior.

Reverses PR #8273, which substitues std::mutex for std::shared_mutex on
macOS, and results in several bugs that seem to only affect MacOS

- https://bugs.dolphin-emu.org/issues/11919
- https://bugs.dolphin-emu.org/issues/11842
- https://bugs.dolphin-emu.org/issues/11845

This change eliminates conditional code for MacOS in the core configuration
layer code and enables the use of modern language features that are more
secure and thread-safe.
 2019-12-22 00:49:17 -05:00
Adrien Guinet
7f74707ad6 cmake: set OpenGL_GL_PREFERENCE as a cached variable that can be modified via the command line 
This allows the user to set this to LEGACY. This can be useful for
people under Linux using optirun/primusrun with "old" nvidia drivers
that don't support GLVND properly.
 2019-11-03 13:16:42 +01:00
Jordan Woyak
d2c1dbef16 CMake: Enable SDL by default on macOS. 2019-10-14 20:51:08 -05:00
Lioncash
d5d60c6e64
Externals: Add libfmt 5.3.0 to externals 
Allows us to migrate off of printf specifiers and have more type-safe
formatting facilities. It also allows for custom type support as well.
fmt is also on track to have part of it standardized within C++2a, so
this will also lessen the transitional work necessary later on by
allowing new code to use it.

This simply adds the library but doesn't do anything with it yet.
 2019-06-10 15:26:43 -04:00
spycrab
d15f5936b3 CMake: Output Windows binaries into Binary 2019-05-15 19:17:03 +02:00
spycrab
ec734065db
Merge pull request #8087 from spycrab/cmake_win2019 
Support CMake on Windows
 2019-05-14 21:07:26 +02:00
spycrab
53ef641da4 CMake: Add MSVC support 2019-05-12 00:44:00 +02:00
Léo Lam
123bbbca2c
Merge pull request #8073 from vladfi1/re-frame-mw 
Bring back MemoryWatcher, but without CoreTiming
 2019-05-10 14:55:27 +02:00
Vlad Firoiu
f4d950f4e2 Revert "Core: Remove MemoryWatcher" 
This reverts commit 0c02e77eee.
 2019-05-05 21:43:45 +01:00
Léo Lam
9133e8f1be Require CMake 3.10 and use CMAKE_CXX_STANDARD 
Removes the need to add -std= flags manually. CMake 3.10 is available
in Ubuntu 18.04, which is the oldest LTS version we support.
 2019-05-05 00:13:13 +02:00
Léo Lam
c40ae4508d Bump minimum GCC version to 7.0 
GCC 7.0 is the first version with full support for C++17.
Also fixes some bugs like https://stackoverflow.com/questions/32097759
 2019-05-04 23:04:18 +02:00
Techjar
0c02e77eee Core: Remove MemoryWatcher 
MemoryWatcher only works on Linux and affects emulation determinism due
to scheduling additional events, which causes NetPlay to desync.
Considering that this interface is a rather specialized use case, the
communication with it is kinda crappy *and* it's affecting emulation, I
think it's best to just axe it and come up with a better implementation
of the functionality.
 2019-04-28 06:22:27 -04:00
Stenzek
eabde77892 CMake: Add an ENABLE_NOGUI option 2019-02-15 18:40:46 +10:00
LAGonauta
7b9375875c Added FreeSurround to Externals 
Also cleaned up its source code to support only 5.1 and 7.1 setups.
 2019-02-13 22:52:39 -02:00
spycrab
6a6fc56865 Externals/ed25519: Add CMakeLists.txt 2019-02-06 20:50:09 +01:00
spycrab
4badc961d0 Qt: Bump minimum macOS version required 2019-01-25 13:18:07 +01:00
orbea
1327772173 cmake: Conditionally build the unit tests. 
This allows to skip building the unit tests and avoids the dependency
on gtest when doing so.
 2018-12-08 14:07:06 -08:00
Stenzek
cfdbd45105 Externals: Add imgui 2018-11-26 20:40:34 +10:00
Pierre Bourdon
e6b2758ab4
Merge pull request #7477 from Zexaron/ext-minizip 
Externals: Add a stripped down version of minizip
 2018-11-17 22:23:02 +01:00
Stenzek
c95802afeb CMake: Make X11 and EGL optional 2018-10-20 21:11:34 +10:00
Stenzek
0559311f92 GLContext: Runtime selection of EGL/GLX on Linux 2018-10-20 21:11:34 +10:00
Stenzek
74b82bab3b GLInterface: Drop Haiku support 2018-10-20 21:11:33 +10:00
Pierre Bourdon
8e26d33133 Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00
Léo Lam
80c402e1ad
Merge pull request #7161 from lioncash/disasm 
CMake: Only link in Bochs on x86 platforms
 2018-09-16 15:16:00 +02:00
orbea
227807df36 cmake: Support system cubeb builds. 2018-08-08 07:36:19 -07:00
Lioncash
7f8cdbb2a4
CMake: Only link in Bochs on x86 platforms 
Bochs' disassembler is only for disassembling x86 code. On non-x86
platforms it doesn't really make sense to build and link this in.
 2018-07-12 16:44:17 -04:00
Markus Wick
196bf8dbe2
Merge pull request #7223 from lioncash/cmake 
CMakeLists: Minor changes
 2018-07-12 14:51:19 +02:00
spycrab
13ba24c5a6 Move DolphinQt2 to DolphinQt 2018-07-07 00:48:38 +02:00
Lioncash
0a4c0a9b4b
CMakeLists: Replace tab indentation with spaces 
We use spaces everywhere else in the CMake scripts, so this just makes
indentation consistent.
 2018-07-06 13:24:22 -04:00
Lioncash
a7cf1548b0
CMakeLists: Remove trailing space 
While we're in the same area, amend the newlining of the if block
 2018-07-06 13:23:39 -04:00
Lioncash
23bc463ec9
CMakeLists: Uppercase "string" in deployment target setting for macOS 
The documentation for setting cache entries dicates that the type must
either be BOOL, FILEPATH, PATH, STRING, or INTERNAL (with those exact
casings). Also, given we properly case it in other places, this is just
consistent.
 2018-07-06 13:20:42 -04:00
Lioncash
904057e611
CMakeLists: Use lowercase for commands 
The general convention for CMake is to use lowercase for commands, and
given we also follow that convention through most CMake files, this just
makes it more consistent.
 2018-07-06 13:13:23 -04:00
David Korth
0149d22385 Removed some more double-expansions of CMAKE_SYSTEM_NAME. 2018-07-02 13:01:16 -04:00
David Korth
72458c1cff CMake: Use thin archives on Linux. 
Thin archives contain pathnames pointing to the object files instead of
full copies of the object files. This significantly reduces the disk
usage when building Dolphin.

Size of *.a files: (gcc-8.1.0, Linux amd64)
- Before: 83,876 KB
- After:   1,876 KB
- Diff:  -82,000 KB

The resulting binaries are the same as before.

A similar change was implemented in the Linux kernel v4.8:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a5967db9af51a84f5e181600954714a9e4c69f1f
 2018-07-02 12:59:09 -04:00
spycrab
44b22c90df Remove DolphinWX 2018-06-26 20:50:39 +02:00
Pierre Bourdon
2cfdf89898
Merge pull request #6983 from yourWaifu/add-discord-rpc-support 
Add Discord Rich Presence support
 2018-06-25 00:06:27 +02:00
yourWaifu
63f03455f3 Discord Rich Presence CMake integration 
I have no idea if this works or not. Hopefully the build bot will tell me.
 2018-06-19 22:43:03 -04:00
Tilka
9bf5ad1f0e
Merge pull request #7021 from akien-mga/cmake-pugixml 
CMake: Fix case in FindPugixml resulting in false negative
 2018-05-30 09:02:44 +01:00
Rémi Verschelde
d37ccc844e CMake: Fix case in FindPugixml resulting in false negative 
As mentioned in GH-6652.
 2018-05-30 09:12:24 +02:00
Rémi Verschelde
c36695175f CMake: Increase minimum GCC version to 6.0 
Dolphin uses nested namespaces from the C++17 standard,
which are only supported in GCC 6.0 and later.

See comments in GH-6866 for details.
 2018-05-30 09:02:14 +02:00
spycrab
94a4c05640 CMakeLists: Remove "Enabling GUI" from the "Wx enabled" message 2018-05-20 17:12:27 +02:00
Emmanuel Gil Peyrot
c51ae9c62a Remove SOIL altogether from the project. 2018-05-20 13:44:42 +02:00
degasus
be3ce97560 CMake: Prefer GLVND for OpenGL. 
We have to decide if we want to link to
libGL.so -- legacy
libOpenGL.so -- GLVND

As we use xxxGetProcAddress, we don't care about feature
levels of the linked library, so we're very fine with the
new way.
 2018-05-09 09:08:22 +02:00
Tillmann Karras
dd6a505380 CMake: update and simplify VTune integration 2018-04-21 18:14:02 +01:00
spycrab
694df74b0b Qt/Wx: Turn Qt into the default interface 2018-04-21 17:54:00 +02:00
Léo Lam
f4ec261719 CMake: Use system-wide pugixml if available 
Makes it possible to use a system-wide pugixml instead of always
using Externals. This is nicer for distro packagers.
 2018-04-15 18:57:39 +02:00
Lioncash
b31281527a
CMakeLists: Define an OProfile target and use it 
Allows us to bring includes and relevant libraries into scope by explicitly declaring linkage against the target
as opposed to using a variable. Also removes the dumping of OProfile includes into the top-level directory.
 2018-04-13 19:35:17 -04:00
Léo Lam
b1bbd8a50e
Merge pull request #6625 from lioncash/evdev-udev 
InputCommon/CMakeLists: Include evdev and udev includes on a by-target basis
 2018-04-13 20:50:31 +02:00
Léo Lam
48242f1521
Merge pull request #6638 from lioncash/lzo 
CMakeLists: Don't dump LZO's includes into the top-level directory
 2018-04-13 20:28:44 +02:00
Lioncash
2851c7e5ee
CMakeLists: Don't dump zlib's includes into the top-level directory 2018-04-13 08:32:48 -04:00
Lioncash
7de2d1c9d6
CMakeLists: Don't dump LZO's includes into the top-level directory 
Instead, we add the includes to the LZO target's interface. That way
only libraries that link it in can see them.
 2018-04-13 07:39:09 -04:00
Lioncash
6a637cfc22
CMakeLists: Don't dump libpng's includes into the top-level directory 
Instead, add the includes to the target, which only libraries that link it in can actually see.
 2018-04-11 17:33:52 -04:00
Lioncash
d63d0b5069
InputCommon/CMakeLists: Include evdev and udev includes on a by-target basis 
Avoids including the evdev/udev includes in the top-level directory
 2018-04-10 09:59:51 -04:00
Lioncash
b9c872dbca
CMakeLists: Don't dump bochs' includes into the top-level directory 
Instead add it to the target interface. This way, only libraries that
link in bochs will see its include directories.
 2018-04-08 20:43:18 -04:00
Lioncash
a4ba92c697
CMakeLists: Don't dump xxhash's includes into top-level directory scope 
We already use a custom CMakeLists file for xxhash, so we can just make it's headers
public as part of its target interface.

This way, only libraries that link in the xxhash target will see its headers, as opposed
to every target under the top-level directory.
 2018-04-06 10:41:58 -04:00
Lioncash
b4e36bbd27
CMakeLists: Move build options to the top of the file 
Makes the configurable aspects of the build more immediately discoverable
as opposed to needing to read down the entire file.
 2018-04-05 08:27:49 -04:00
Lioncash
84ed6fd445
CMakeLists: Remove the LIBS variable 
Now that we link all libraries in explicitly, the top-level LIBS variable can finally go.
 2018-04-04 11:46:30 -04:00
Lioncash
8db4ab7dd6
CMakeLists: Remove iconv from the LIBS variable 
Adjusts Common to use the ICONV_LIBRARIES variable directly and doesn't
append it to the LIBS variable.

After this, there's only one remaining usage where libraries are added
to the LIBS variable, after which it can be removed once the rest of
the targets are migrated off add_dolphin_library
 2018-04-01 14:00:55 -04:00
Lioncash
677b9b717f
CMakeLists: Remove enet from the LIBS variable 
All libraries that use enet already link it in explicitly. This reduces
the usages of the LIBS variable.
 2018-04-01 11:18:08 -04:00
Lioncash
eee32c030b
CMakeLists: Remove lzo from the LIBS variable and make linkage private 
The only place this library is needed (core) is already linked in the core target.
Also make the linkage private to create linkage failures if the dependency isn't
explicitly linked in elsewhere where it should be.

Reduces the dependency on the LIBS variable.
 2018-03-31 15:01:05 -04:00
Lioncash
e93159e54a
CMakeLists: Link in system framework libraries explicitly on macOS 
Makes our libraries explicitly link in which libraries they need.
This makes our dependencies explicit and removes the reliance on the
LIBS variable to contain the libraries that they need.
 2018-03-30 16:14:10 -04:00
Lioncash
b8a4ab23dd
InputCommon/CMakeLists: Link in ForceFeedback library explicitly on macOS 
Makes an implicit dependency explicit. Also makes the macOS libraries link privately
as they aren't used in the exposed interface.
 2018-03-29 11:53:50 -04:00
Lioncash
b818cc682c VideoCommon/Vulkan: Explicitly link in xxhash 
Lessens the dependency on the LIBS variable (and also makes the required
libraries explicit).
 2018-03-28 17:03:16 -04:00
spycrab
4f63d7f204 Qt: Fix low-resolution icon 2018-03-27 17:32:45 +02:00
Pierre Bourdon
f221fac02e cmake: check for optional libsystemd presence 2018-03-08 06:00:40 +00:00
Greg V
be716a680f Do not link to libusbhid on FreeBSD/NetBSD 
Both libusbhid (system library) and libhidapi (3rd party library)
provide a function called hid_init. Dolphin was being linked to both.

The WiimoteScannerHidapi constructor was calling hid_init without
arguments. libusbhid's hid_init expects one argument (a file path).
It was being called as if it was defined without arguments, which
resulted in a garbage path being passed in, and because of that,
the Qt GUI was failing to launch with the following error:
'dolphin-emu-qt2: @ : No such file or directory'
 2018-02-05 00:46:59 +03:00
Greg Wicks
c2dcb97d06 Android: Fix NDK r16b2 build 2017-11-07 11:02:27 -05:00
spycrab
28799bbe79 CMake: Build DolphinQt2 by default 2017-09-04 22:28:48 +02:00
spycrab
fc4de1b872 CMake: Move DISABLE_WX to ENABLE_WX 2017-09-02 18:59:27 +02:00
Michael M
fc306faad8 CMake: use miniupnpc target instead of global vars 2017-08-17 13:15:02 -07:00
Michael Maltese
18e70cdf91 Only build OpenAL on Windows 2017-06-27 00:06:14 -07:00
Michael Maltese
0fb742581a CMake: remove duplicated call to find OpenAL 2017-06-27 00:06:13 -07:00
Léo Lam
b08201654e Externals: Add zeux/pugixml@38edf25 
Along with VS boilerplate to get it to build on Windows.
 2017-06-13 14:05:10 +02:00
Shawn Hoffman
fffe2c0a2b cmake: enable same conformance-related flags as msbuild 2017-06-05 23:25:13 -07:00
shuffle2
192fec50b9 Merge pull request #5276 from ligfx/macosheadless 
Add headless support on macOS
 2017-06-05 20:49:02 -07:00
shuffle2
3443454ba2 Merge pull request #5271 from JosJuice/allow-aslr 
Allow (but don't force) ASLR
 2017-06-02 21:53:02 -07:00
Michael Maltese
34ad1eb547 Externals: remove PortAudio 2017-05-27 18:28:57 -07:00
Michael Maltese
812520cc65 Add cubeb@62871b2 to Externals/ 
Includes submodule sanitizers-cmake@f09151b
 2017-05-27 18:28:56 -07:00
Michael Maltese
53acd25de4 Rename define HAVE_LIBAV->HAVE_FFMPEG 2017-05-26 00:53:58 -07:00
Michael Maltese
d951d2e4c4 CMake: libav/ffmpeg cleanups 
Use @Orphis's FindFFmpeg module from ppsspp:
2149d3db7f

From that commit:

> This new module should be able to handle both libraries in the regular
> paths and fallback to pkg-config.
> It is also able to find dynamic libraries, not just static libraries.
> It will generate imported targets with the name FFmpeg::<lib> that you
> can use in your scripts.
 2017-05-26 00:53:58 -07:00
Michael Maltese
be2f4466e3 CMake: move unittests target to UnitTests 2017-05-22 00:19:14 -07:00
JosJuice
e019872d62 Remove no-pie build flags 2017-05-20 09:35:53 +02:00
JosJuice
4b4cf509f8 Remove code for only allocating low memory 
This is unnecessary when we have position-independent code.
 2017-05-20 09:35:53 +02:00
Matthew Parlane
d20bb985ad Merge pull request #5369 from ligfx/cmakegtestnosystem 
CMake: don't look for shared Google Test
 2017-05-04 13:24:10 +12:00
Mat M
f3052b7a15 Merge pull request #5318 from ligfx/cmakehidapi 
CMake: clean up HIDAPI build
 2017-05-03 19:54:06 -04:00
Michael Maltese
cd7af32e0b CMake: gtest already propagates include directories 2017-05-03 16:22:14 -07:00
Michael Maltese
9ac94d0135 CMake: don't look for shared Google Test 
Google Test recommends not using a pre-compiled system copy[1] and
Debian and Ubuntu no longer distribute compiled packages.

This removes an unhelpful line from the CMake log: "Could NOT find GTest
(missing: GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY)."

[1]: https://github.com/google/googletest/blob/master/googletest/docs/FAQ.md#why-is-it-not-recommended-to-install-a-pre-compiled-copy-of-google-test-for-example-into-usrlocal
 2017-05-03 15:29:29 -07:00
Michael Maltese
5230a8c996 CMake: only look for Bluez on Linux 
Stops CMake from saying "BlueZ NOT found, disabling bluetooth support"
on other OSes. Windows, macOS, and Android support Bluetooth using other
libraries. I'm not sure if non-Linux, non-Android Unices (like FreeBSD)
need another message?
 2017-05-03 15:15:47 -07:00
Michael Maltese
655ab9b4e2 CMake: clean up HIDAPI build 2017-04-27 02:41:00 -07:00
Michael Maltese
6e1940c404 CMake: don't globally include wxWidgets headers 2017-04-25 17:18:20 -07:00
Michael Maltese
f4c0723387 CMake: move wxWidgets check_lib code into wxWidgets 2017-04-25 17:18:20 -07:00
Michael Maltese
6197d9622f CMake: move GTK+ check into wxWidgets 2017-04-25 17:18:20 -07:00
Michael Maltese
f7892faa80 CMake: remove artisanal wxWidgets version check 2017-04-25 09:35:42 -07:00
Michael Maltese
5298328cb1 Add headless support on macOS 2017-04-15 19:34:42 -07:00
Markus Wick
2151858fb1 Merge pull request #5241 from MerryMage/stretch 
Pitch-Preserving Audio Stretching
 2017-04-12 20:27:26 +02:00
MerryMage
b8c867dd7a Mixer: Implement audio stretching 2017-04-12 13:56:28 +01:00
Michael Maltese
5b829163a3 CMake: turn on -fdiagnostics-color for Ninja builds 
This PR attempts to turn on `-fdiagnostics-color` by default when using
the CMake Ninja generator.

Ninja effectively turns off colored messages by not running subcommands
in a pseudo-terminal. The Ninja maintainers have decided that using
pseudo-terminals has more downsides than upsides, but have helpfully
taught Ninja itself how to parse and remove color codes if its parent
isn't a (pseudo-)terminal.

Colored messages make it easier to read warnings and error messages in a
large build log, and are pretty.
 2017-04-11 18:00:46 -07:00
Michael Maltese
af63235dc4 Remove libao sound backend 
A single person uses it[0], and it sometimes messes up the Linux
buildbots ("ninja: error: 'ao', needed by 'Binaries/dolphin-emu', missing
and no known rule to make it").

[0]: https://analytics.dolphin-emu.org/stats/popular-audio-backends.txt
 2017-03-31 14:59:57 -07:00
Matthew Parlane
85d74a506f Merge pull request #4951 from waddlesplash/haiku-2 
Initial support for Haiku.
 2017-03-28 17:19:35 +13:00
Augustin Cavalier
0831dad467 Initial support for Haiku. 2017-03-27 23:46:19 -04:00
orbea
0d0f6f7278 Don't install static mbedtls libraries 2017-03-19 08:45:38 -07:00
Florent Castelli
5514680bc8 cmake: Fix typo in dolphin_compile_definitions 2017-03-08 06:47:00 +01:00
Vlad Firoiu
8970c1a793 Don't use hidapi-hidraw without udev. 2017-03-05 10:42:31 -08:00
Lioncash
ee61bd6f2e CMakeLists: Normalize whitespace 
Normalizes tabs to spaces to follow our codebase's indentation style.
 2017-03-01 14:53:23 -05:00
Ryan Houdek
77c7fa836f Add the cpp-optparse project to Externals. 
From https://github.com/weisslj/cpp-argparse
 2017-02-16 14:09:13 +01:00
Michael Maltese
45d1f88ea7 CMake: move modules from CMakeTests/ -> CMake/ 
The name "CMakeTests" is inaccurate and irregular.
 2017-02-07 22:55:27 -08:00
Florent Castelli
f649e26655 cmake: Move LLVM import to UICommon 
To use it, with a modern LLVM (3.9+), set your CMAKE_PREFIX_PATH
to point to the LLVM install folder or to a LLVM build folder.
We're linking ALL of LLVM libs since I don't really know which ones we need.
LTO will take care of sliming the binary size...
 2017-02-08 03:30:38 +01:00
Florent Castelli
428d1624fa cmake: Move BlueZ detection to Core 2017-02-08 01:08:33 +01:00
Mat M
277f813b72 Merge pull request #4849 from Orphis/cmake_audiocommon 
cmake: Move PulseAudio detection to AudioCommon
 2017-02-07 18:08:10 -05:00
Florent Castelli
c1dcd06043 cmake: Move PulseAudio detection to AudioCommon 2017-02-07 23:35:44 +01:00
Michael Maltese
4d5cc27243 CMake: re-run if .git/$(symbolic-full-name HEAD) changes 
In an oversight, PR #4841 didn't handle committing to or amending a
branch.
 2017-02-07 00:53:05 -08:00
Mat M
bdf09c7d3b Merge pull request #4841 from ligfx/accuratescmrev 
CMake: re-run to get version information when .git/HEAD changes
 2017-02-06 22:12:55 -05:00
Florent Castelli
d1eaa59a8e cmake: Move detection of OpenAL to AudioCommon 2017-02-07 03:42:43 +01:00
Florent Castelli
cbb7e4072a cmake: Move AO detection to AudioCommon 2017-02-07 03:42:43 +01:00
Michael Maltese
9502f322d3 CMake: re-run to get version information when .git/HEAD changes 
Fixes an issue where Dolphin's revision information could be incorrect
when:

1) CMake was run while HEAD was at commit A
2) HEAD was set to commit B, which didn't have differences from A
that would cause CMake to be re-run

This does not fix the issue with incorrect information about whether
Dolphin was built from a dirty working tree or not.
 2017-02-06 18:28:52 -08:00
Mat M
f978765bf0 Merge pull request #4755 from Orphis/cmake_sdl 
cmake: Modernize SDL discovery
 2017-02-06 11:55:03 -05:00
Mat M
02127e360a Merge pull request #4831 from Orphis/cmake_cleanup 
Small CMake fixes
 2017-02-06 11:29:05 -05:00
Michael Maltese
acc8dae2b3 CMake: use configure_file to generate scmrev.h 
The built-in `configure_file` command correctly handles the case where
none of the variables change and scmrev.h doesn't need to be rebuilt.
This saves a full re-link of Dolphin any time CMake is re-run.
 2017-02-05 22:26:49 -08:00
Matthew Parlane
abe7081337 Merge pull request #4818 from ligfx/bundleutilities 
CMake: use BundleUtilities to fix up Dolphin.app
 2017-02-06 17:39:46 +13:00
Florent Castelli
a7c4fd9bf0 cmake: Move discovery of SDL to InputCommon 2017-02-06 05:02:45 +01:00
Florent Castelli
5984ca26f3 wx: Move platform defines to wx setup header 
Usually, this is passed as a preprocessor definition, but this is error
prone and just complicating the compiler invocation for no good reason.
 2017-02-06 04:27:06 +01:00
Florent Castelli
8464480ceb cmake: Remove -nopie, -no-pie should be used instead 2017-02-06 04:25:28 +01:00
Florent Castelli
d096b7b378 cmake: Prevent gtest from installing its files 2017-02-05 20:19:30 +01:00
Florent Castelli
5058d07861 cmake: Fix resource installation for Linux 2017-02-05 20:17:11 +01:00
Florent Castelli
2fceb016b4 cmake: Move ALSA detection to AudioCommon 2017-02-05 02:55:05 +01:00
Michael Maltese
38816bf51d CMake: use BundleUtilities to fix up Dolphin.app 2017-02-03 22:27:19 -08:00
Florent Castelli
fb02a321b6 cmake: Move OpenSLES detection to AudioCommon through find_package() 2017-02-04 03:38:11 +01:00
Mat M
a3ba169e7d Merge pull request #4809 from Orphis/cmake_windows 
CMake for Windows: getting a working binary!
 2017-02-03 08:33:13 -05:00
Florent Castelli
3842a9b71c OpenAL: Move Windows binaries to lib folder and fix CMake detection 
The module FindOpenAL is looking for the dll in a folder called lib, not x64.
This is only used on Windows x64, it's fine to remove the platform name.
 2017-02-03 04:54:54 +01:00
Florent Castelli
8bd41ad606 cmake: Add missing Windows link flags 2017-02-03 04:54:30 +01:00
Florent Castelli
7ccbe9b06d portaudio: Prevent files from being install()'ed 2017-02-03 04:24:13 +01:00
Florent Castelli
9180c87197 cmake: Put test targets in folders 2017-02-03 04:23:24 +01:00
Mat M
1dd229fac8 Merge pull request #4752 from Orphis/cmake_cleanup 
cmake: Improve support for multi-configuration generators
 2017-02-02 20:59:13 -05:00
Florent Castelli
0f9a6697fb DolphinWX: Update how localization files are installed 
On macOS, we want them copied in the bundle directly, otherwise we will
install them later in the system folder.
Obviously not working for Windows, but that's not any different from before!
 2017-02-02 03:51:32 +01:00
Florent Castelli
62c439814f cmake: Move Qt5 search to DolphinQt build script 2017-02-01 21:49:26 +01:00
Florent Castelli
8ef5b6d302 cmake: Removes check against CMAKE_BUILD_TYPE for multi-configuration generators 2017-02-01 21:44:50 +01:00
Florent Castelli
8882f33e94 cmake: Add dolphin_compile_definitions function 
This is similar to add_definitions, but supports generator expressions.
It also has an optional argument to add only to Debug or Release
configurations.
 2017-02-01 21:44:50 +01:00
Florent Castelli
f5fd5477e3 cmake: Use new option in check_and_add_flag to add options correctly 
Previously, -ggdb wouldn't be added when using the Xcode generator.
And now, the code for -fomit-frame-pointer is much more simple.
 2017-02-01 21:44:50 +01:00
Michael Maltese
497173f665 CMake: Disable PortAudio support for ASIO, DS, and WDMKS 
Fixes a link-time error, and matches what the vcxproj does.
 2017-01-27 02:50:50 -08:00
Michael Maltese
0475a85195 CMake: Move Windows defines to Source/CMakeLists.txt 
Messes up various Externals, like PortAudio.
 2017-01-27 02:50:49 -08:00
Michael Maltese
4a422dffaa CMake: CMAKE_SIZEOF_VOID_P must be 8 for an x86_64 build 
This is an issue because CMAKE_SYSTEM_PROCESSOR is defined as the host
processor when not cross-compiling, and building for Win32 doesn't count
as cross-compiling.
 2017-01-27 02:50:36 -08:00
Florent Castelli
bf2890f1f8 cmake: Change else(.*) to else() 2017-01-25 15:07:32 +01:00
Florent Castelli
87380c1c2c cmake: Change endif(.*) to endif() 2017-01-25 15:07:32 +01:00
Florent Castelli
2fd034789e cmake: Move /MP flag to MSVC compile flag section 2017-01-25 06:10:20 +01:00
Florent Castelli
221f991f1e cmake: Move section to disable PIE with the other compiler flags 2017-01-25 06:10:20 +01:00
Florent Castelli
1dda078c61 cmake: Compile on Windows with C++ Exceptions 2017-01-25 06:10:20 +01:00
Florent Castelli
d2cb5e6407 cmake: Small random cleanups 2017-01-25 06:10:20 +01:00
Florent Castelli
aac17b06d1 cmake: Split compile definitions and options 2017-01-25 06:10:20 +01:00
Florent Castelli
5129ba1289 cmake: Add section with Windows defines 2017-01-25 06:10:19 +01:00
Florent Castelli
fafb103c52 cmake: Move LTO settings lower in the file 2017-01-25 06:10:19 +01:00
Florent Castelli
925297d528 cmake: Simplify setting arch flags on macOS 2017-01-25 06:10:19 +01:00
Florent Castelli
3e28ebc31e cmake: Fix arch detection 
Windows arch is set to AMD64, and we don't really want ix86 either
 2017-01-25 06:10:19 +01:00
Florent Castelli
c48617008d cmake: Regroup compilation flags together 2017-01-25 06:10:19 +01:00
Florent Castelli
ff4ef08745 cmake: Readd fomit-frame-pointer on macOS 
Make it also properly set on Release for multi-configuration generators
 2017-01-25 06:10:19 +01:00
Florent Castelli
8f355962ce cmake: Move include higher up in the file 2017-01-25 06:10:19 +01:00
Florent Castelli
ec84c26975 cmake: Remove unused variable 2017-01-25 06:10:18 +01:00
Florent Castelli
b9127cd2e0 cmake: Regroup definitions for 64bit file offsets 2017-01-25 06:10:18 +01:00
Florent Castelli
a2e40a11d7 Fix typo MinSizeRe -> MinSizeRel 2017-01-25 06:10:18 +01:00
Florent Castelli
08b73b8a77 cmake: Move check_and_add_flag to a separate file 
Also make it add flags to both C and C++ when appropriate
 2017-01-25 02:34:33 +01:00
Markus Wick
eed64bb0fe Merge pull request #4744 from ligfx/cleanup-osx-cmake 
CMake: Cleanup macOS-related logic
 2017-01-24 14:36:10 +01:00
Michael Maltese
c85127c973 CMake: move CMAKE_MACOSX_RPATH with rest of macOS logic 2017-01-24 01:27:42 -08:00
Michael Maltese
b65b87c8b4 CMake: don't need to force Clang on macOS 
It's already the default!
 2017-01-24 01:27:42 -08:00
Michael Maltese
7ebb1b4d3d CMake: find_package(Threads) on macOS too 2017-01-24 01:27:41 -08:00
Michael Maltese
4cbd07b81f CMake: remove unneeded macOS frameworks 2017-01-24 01:27:41 -08:00
Michael Maltese
0ab3b1a3ff CMake: use CMAKE_OSX_DEPLOYMENT_TARGET 2017-01-24 01:27:41 -08:00
Michael Maltese
951eb9a801 CMake: use CMAKE_OSX_ARCHITECTURES 2017-01-23 23:44:38 -08:00
Florent Castelli
a917d247ed DolphinWX: Remove HAVE_WX preprocessor define 
I think we don't have to double check it when building the WX target.
 2017-01-24 05:48:08 +01:00
Florent Castelli
fa04c1479e cmake: Remove PCH support 
Compilers are very picky and don't use PCH when they have been compiled
with different flags. I even got some ICE in MSVC, so removing them for now.

Modules are the solution.
 2017-01-24 03:22:03 +01:00
Florent Castelli
6c197a8f6a cmake: Rename variable for libxi to X11_INPUT 2017-01-21 02:44:18 +01:00
Florent Castelli
08d6a24bbc cmake: Build HIDAPI on Windows 2017-01-21 00:34:02 +01:00
Florent Castelli
56559c51cf cmake: librt is found only on Linux 2017-01-21 00:34:02 +01:00
Florent Castelli
4785802b9e cmake: Move C++ standard requirement out of global scope to Source/ 2017-01-20 17:46:40 +01:00
Florent Castelli
17187694f6 cmake: Add CCache support 2017-01-17 22:39:51 +01:00
Florent Castelli
6829b42846 cmake: Don’t use message(“”) 
If there’s no category, the message ends up in stderr instead of stdout with the other regular CMake output.
 2017-01-17 22:39:51 +01:00
Florent Castelli
2c6d2dd1e3 cmake: Find programs on the host too when building for Android 2017-01-17 22:39:51 +01:00
Florent Castelli
62eccff315 Remove policy check for BSD as it is ON by default now 2017-01-17 21:50:44 +01:00
Florent Castelli
875563787f cmake: include(Find…)->find_package(…) 2017-01-17 21:50:44 +01:00
Mat M
81358dbf20 Merge pull request #4674 from Orphis/require_gcc5 
cmake: Enforce minimum GCC version
 2017-01-17 14:35:38 -05:00
Florent Castelli
868c59dd1c cmake: Enforce minimum GCC version 2017-01-17 20:02:21 +01:00
Lioncash
bae0158fc1 CMakeLists: Make CMake 3.5.0 the minimum requirement 2017-01-17 13:36:39 -05:00
Jeffrey Pfau
1b161aad6b CMake: Search /usr/local paths on BSD 
CMake would have trouble with some configuration tests on FreeBSD (and
presumably other BSDs) due to installed libraries being in /usr/local, but
not being in the default search path. Adding these to the default search path
fixes mbedtls and portaudio not being found, and possibly more.
 2017-01-17 00:46:10 -08:00
Florent Castelli
5955c86ec5 cmake: Set MACOSX_RPATH to OFF 
In newer versions of CMake, the variable is ON by default.
This generates imports like @rpath/libusb.dylib which the
packaging script doesn’t understand.
We don’t really need @rpath, so we can just disable it
at the global scope instead of fixing the script.
 2017-01-17 04:23:56 +01:00
Emmanuel Gil Peyrot
de485f3efc CMake: Add an option to disable bluez support. 
This removes bluetooth support.
 2016-12-27 15:08:33 +01:00
Emmanuel Gil Peyrot
c57f7414a8 CMake: Add an option to disable LLVM support. 
This makes the disassembler only work for x86.
 2016-12-27 15:08:13 +01:00
Emmanuel Gil Peyrot
6033250beb CMake: Add an option to disable each sound backend. 
They are already disabled when the libraries can’t be found, this only
helps people who want to build without them despite having them
installed, for example to provide a package to someone else.
 2016-12-27 15:08:10 +01:00
Grant Paul
449ae01db6 Remove dead code to set the path to the macOS SDK. 
CMake autodetects a macOS SDK into `CMAKE_OSX_SYSROOT`. There's no
need to duplicate that logic and search out a specifc old version.
 2016-12-08 20:53:12 -08:00
Léo Lam
f270438a8a CMakeLists: Fix indentation 2016-11-20 18:11:57 +01:00
Jules Blok
49ac577ac0 Merge pull request #4388 from ligfx/portaudio_static 
CMake: build PortAudio as static library
 2016-11-01 18:32:12 +01:00
Michael Maltese
04e262513c CMake: build PortAudio as static library 
Due to issues raised in #4255.
 2016-10-26 11:53:14 -07:00
Chris Burgener
6fde08bc34 Check if compilers support -no-pie or -nopie 2016-10-21 10:36:33 -04:00