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
d1eaa59a8e
cmake: Move detection of OpenAL to AudioCommon
2017-02-07 03:42:43 +01:00
cbb7e4072a
cmake: Move AO detection to AudioCommon
2017-02-07 03:42:43 +01:00
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
f978765bf0
Merge pull request #4755 from Orphis/cmake_sdl
...
cmake: Modernize SDL discovery
2017-02-06 11:55:03 -05:00
02127e360a
Merge pull request #4831 from Orphis/cmake_cleanup
...
Small CMake fixes
2017-02-06 11:29:05 -05:00
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
abe7081337
Merge pull request #4818 from ligfx/bundleutilities
...
CMake: use BundleUtilities to fix up Dolphin.app
2017-02-06 17:39:46 +13:00
a7c4fd9bf0
cmake: Move discovery of SDL to InputCommon
2017-02-06 05:02:45 +01:00
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
8464480ceb
cmake: Remove -nopie, -no-pie should be used instead
2017-02-06 04:25:28 +01:00
d096b7b378
cmake: Prevent gtest from installing its files
2017-02-05 20:19:30 +01:00
5058d07861
cmake: Fix resource installation for Linux
2017-02-05 20:17:11 +01:00
2fceb016b4
cmake: Move ALSA detection to AudioCommon
2017-02-05 02:55:05 +01:00
38816bf51d
CMake: use BundleUtilities to fix up Dolphin.app
2017-02-03 22:27:19 -08:00
fb02a321b6
cmake: Move OpenSLES detection to AudioCommon through find_package()
2017-02-04 03:38:11 +01:00
a3ba169e7d
Merge pull request #4809 from Orphis/cmake_windows
...
CMake for Windows: getting a working binary!
2017-02-03 08:33:13 -05:00
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
8bd41ad606
cmake: Add missing Windows link flags
2017-02-03 04:54:30 +01:00
7ccbe9b06d
portaudio: Prevent files from being install()'ed
2017-02-03 04:24:13 +01:00
9180c87197
cmake: Put test targets in folders
2017-02-03 04:23:24 +01:00
1dd229fac8
Merge pull request #4752 from Orphis/cmake_cleanup
...
cmake: Improve support for multi-configuration generators
2017-02-02 20:59:13 -05:00
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
62c439814f
cmake: Move Qt5 search to DolphinQt build script
2017-02-01 21:49:26 +01:00
8ef5b6d302
cmake: Removes check against CMAKE_BUILD_TYPE for multi-configuration generators
2017-02-01 21:44:50 +01:00
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
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
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
0475a85195
CMake: Move Windows defines to Source/CMakeLists.txt
...
Messes up various Externals, like PortAudio.
2017-01-27 02:50:49 -08:00
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
bf2890f1f8
cmake: Change else(.*) to else()
2017-01-25 15:07:32 +01:00
87380c1c2c
cmake: Change endif(.*) to endif()
2017-01-25 15:07:32 +01:00
2fd034789e
cmake: Move /MP flag to MSVC compile flag section
2017-01-25 06:10:20 +01:00
221f991f1e
cmake: Move section to disable PIE with the other compiler flags
2017-01-25 06:10:20 +01:00
1dda078c61
cmake: Compile on Windows with C++ Exceptions
2017-01-25 06:10:20 +01:00
d2cb5e6407
cmake: Small random cleanups
2017-01-25 06:10:20 +01:00
aac17b06d1
cmake: Split compile definitions and options
2017-01-25 06:10:20 +01:00
5129ba1289
cmake: Add section with Windows defines
2017-01-25 06:10:19 +01:00
fafb103c52
cmake: Move LTO settings lower in the file
2017-01-25 06:10:19 +01:00
925297d528
cmake: Simplify setting arch flags on macOS
2017-01-25 06:10:19 +01:00
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
c48617008d
cmake: Regroup compilation flags together
2017-01-25 06:10:19 +01:00
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
8f355962ce
cmake: Move include higher up in the file
2017-01-25 06:10:19 +01:00
ec84c26975
cmake: Remove unused variable
2017-01-25 06:10:18 +01:00
b9127cd2e0
cmake: Regroup definitions for 64bit file offsets
2017-01-25 06:10:18 +01:00
a2e40a11d7
Fix typo MinSizeRe -> MinSizeRel
2017-01-25 06:10:18 +01:00
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
eed64bb0fe
Merge pull request #4744 from ligfx/cleanup-osx-cmake
...
CMake: Cleanup macOS-related logic
2017-01-24 14:36:10 +01:00
c85127c973
CMake: move CMAKE_MACOSX_RPATH with rest of macOS logic
2017-01-24 01:27:42 -08:00
Mat M