piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
5c95dc61fc
dolphin/Source/CMakeLists.txt

52 lines
1.6 KiB
CMake
Raw Normal View History

CMake: Move Windows defines to Source/CMakeLists.txt Messes up various Externals, like PortAudio.
2017-01-27 01:58:21 -07:00
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
add_definitions(-DNOMINMAX)
add_definitions(-DUNICODE)
add_definitions(-D_UNICODE)
add_definitions(-DWIN32_LEAN_AND_MEAN)
add_definitions(-D_WIN32_WINNT=0x0602)
CMake: use _SCL_SECURE_NO_WARNINGS instead of _SECURE_SCL=0 _SECURE_SCL is deprecated (and doesn't seem to disable warnings anymore with Visual Studio 2015).
2017-02-10 17:28:37 -07:00
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
CMake: Move Windows defines to Source/CMakeLists.txt Messes up various Externals, like PortAudio.
2017-01-27 01:58:21 -07:00
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
endif()
Common: Add a std::optional implementation std::optional makes a few things a bit neater and less error prone. However, we still cannot use C++17 (unfortunately), so this commit adds an implementation of std::optional that we can use right now. Based on https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/lib/gtl/optional.h which seems to be fairly similar to C++17's <optional> and standards compliant. It's one of the few implementations that handle propagating type traits like copy constructibility, just like libc++/libstdc++.
2017-05-07 05:29:53 -06:00
if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
# enable the latest C++ standard feature set,
# and also disable MSVC specific extensions
# to be even more standards compliant.
check_and_add_flag(CPPLATEST /std:c++latest)
check_and_add_flag(STANDARD_COMPLIANCE /permissive-)
else()
# Enable C++17, but fall back to C++14 if it isn't available.
# CMAKE_CXX_STANDARD cannot be used here because we require C++14 or newer, not any standard.
check_and_add_flag(CXX17 -std=c++17)
if(NOT FLAG_CXX_CXX17)
CMake: don't use -std=c++1z Some toolchains provide enough of C++17 to conflict with Dolphin's included backport of std::variant and std::optional. Specifically, the recently-released macOS 10.13 SDK does not provide the <optional> or <variant> headers, but does provide `in_place_t` in the <utility> header.
2017-09-27 16:46:25 -06:00
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Common: Add a std::optional implementation std::optional makes a few things a bit neater and less error prone. However, we still cannot use C++17 (unfortunately), so this commit adds an implementation of std::optional that we can use right now. Based on https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/lib/gtl/optional.h which seems to be fairly similar to C++17's <optional> and standards compliant. It's one of the few implementations that handle propagating type traits like copy constructibility, just like libc++/libstdc++.
2017-05-07 05:29:53 -06:00
endif()
# These compat headers must not be in the include path when building with MSVC,
# because it currently does not support __has_include_next / #include_next.
include_directories(SYSTEM Core/Common/Compat)
endif()
add the same flags to CMake
2017-05-26 15:01:41 -06:00
cmake: Move C++ standard requirement out of global scope to Source/
2017-01-20 09:44:23 -07:00
# These aren't actually needed for C11/C++11
# but some dependencies require them (LLVM, libav).
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-D__STDC_CONSTANT_MACROS)
Add an experimental CMake build system as a possible replacement for SCons. Only tested on Linux, should work on OS X and Windows in the future as well though. Some notes about this: - config.h doesn't get written yet, so you'll have to use one generated by SCons - dependency checking isn't really implemented, yet. Just some basic checks for OpenGL or ALSA, we need something more sophisticated though. - the OpenGL plugin fails to load for some reason which I can't debug right now due to the libc debuginfo package version in openSUSE not matching the runtime packages - there's even some support for generating install packages (rpm/deb/.. packages, NSIS installer, etc). It doesn't work properly right now though, since some paths seem to be hardcoded into Dolphin's source - probably lots of other stuff I forgot... Just take a look at all the TODOs in the CMakeLists.txt files for more information ;P Additionally, I added various files to the svn:ignore list. tl;dr: Unless you are a dev or you're building binary packages, this commit shouldn't bother you :P git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6326 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-01 09:47:02 -06:00
add_subdirectory(Core)
Strip the Android shared library file. This cuts down the shared library size from ~11MB to ~5.5MB
2016-01-20 09:32:53 -07:00
if (ANDROID)
CMakeLists: Normalize whitespace Normalizes tabs to spaces to follow our codebase's indentation style.
2017-03-01 05:43:43 -07:00
add_subdirectory(Android/jni)
Strip the Android shared library file. This cuts down the shared library size from ~11MB to ~5.5MB
2016-01-20 09:32:53 -07:00
endif()
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 15:06:23 -07:00
if (ENABLE_TESTS)
add_subdirectory(UnitTests)
endif()
Add the DSPTool and UnitTests to the cmake build. They are optional, and to enable them add -DDSTPTOOL and -DUNITTESTS to the cmake command line. Also, don't check to see if a directory is a wad file. They aren't. This removes an annoying and invalid debug assertion with the debug build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7682 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-07-17 19:47:55 -06:00
if (DSPTOOL)
CMakeLists: Normalize whitespace Normalizes tabs to spaces to follow our codebase's indentation style.
2017-03-01 05:43:43 -07:00
add_subdirectory(DSPTool)
Add the DSPTool and UnitTests to the cmake build. They are optional, and to enable them add -DDSTPTOOL and -DUNITTESTS to the cmake command line. Also, don't check to see if a directory is a wad file. They aren't. This removes an annoying and invalid debug assertion with the debug build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7682 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-07-17 19:47:55 -06:00
endif()
Fix various comment typos
2016-09-11 16:25:45 -06:00
# TODO: Add DSPSpy. Preferably make it option() and cpack component
Reference in New Issue Copy Permalink