ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/CMakeLists.txt

47 lines
1.3 KiB
CMake
Raw Normal View History

CMake: Move Windows defines to Source/CMakeLists.txt Messes up various Externals, like PortAudio.
2017-01-27 08:58:21 +00: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-11 00:28:37 +00: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 08:58:21 +00: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 11:29:53 +00: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 All supported platforms now have easy access to a compiler with C++17 support. C++17 potentially allows for some nice cleanups and removes the need for standard library backports (optional/variant). See discussion at https://dolp.in/pr6264#discussion_r158134178
2017-12-25 21:35:08 +00:00
# Enable C++17
# CMAKE_CXX_STANDARD cannot be used because it requires cmake 3.8+.
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 11:29:53 +00:00
check_and_add_flag(CXX17 -std=c++17)
if(NOT FLAG_CXX_CXX17)
Enable C++17 All supported platforms now have easy access to a compiler with C++17 support. C++17 potentially allows for some nice cleanups and removes the need for standard library backports (optional/variant). See discussion at https://dolp.in/pr6264#discussion_r158134178
2017-12-25 21:35:08 +00:00
# Fall back to -std=c++1z
check_and_add_flag(CXX1Z -std=c++1z)
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 11:29:53 +00:00
endif()
endif()
add the same flags to CMake
2017-05-26 21:01:41 +00:00
cmake: Move C++ standard requirement out of global scope to Source/
2017-01-20 16:44:23 +00: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 15:47:02 +00: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 16:32:53 +00:00
if (ANDROID)
CMakeLists: Normalize whitespace Normalizes tabs to spaces to follow our codebase's indentation style.
2017-03-01 12:43:43 +00: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 16:32:53 +00: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 22:06:23 +00: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-18 01:47:55 +00:00
if (DSPTOOL)
CMakeLists: Normalize whitespace Normalizes tabs to spaces to follow our codebase's indentation style.
2017-03-01 12:43:43 +00: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-18 01:47:55 +00:00
endif()
Fix various comment typos
2016-09-11 22:25:45 +00:00
# TODO: Add DSPSpy. Preferably make it option() and cpack component