- Disable annoying VS warnings

- Option to enable multiprocessor build on VS
- Move all options to CMake:
   - Unicode
   - Platform specs
This commit is contained in:
Robert Hauck
2015-02-17 10:47:49 +01:00
parent 0fa61b0c95
commit b755c24804
2 changed files with 52 additions and 35 deletions

View File

@@ -13,38 +13,6 @@
#ifndef NANA_CONFIG_HPP
#define NANA_CONFIG_HPP
//Select platform automatically
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
//Windows:
#define NANA_WINDOWS 1
#define PLATFORM_SPEC_HPP <nana/detail/win32/platform_spec.hpp>
//Test if it is MINGW
#if defined(__MINGW32__)
#define NANA_MINGW
#define STD_CODECVT_NOT_SUPPORTED
//#define STD_THREAD_NOT_SUPPORTED //Use this flag if MinGW version is older than 4.8.1
#endif
#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
//Linux:
#define NANA_LINUX 1
#define NANA_X11 1
#define PLATFORM_SPEC_HPP <nana/detail/linux_X11/platform_spec.hpp>
#define STD_CODECVT_NOT_SUPPORTED
#endif
//Here defines some flags that tell Nana what features will be supported.
#define NANA_UNICODE
#if defined(NANA_UNICODE) && defined(NANA_WINDOWS)
#ifndef _UNICODE
#define _UNICODE
#endif
#ifndef UNICODE
#define UNICODE
#endif
#endif
//All defines have been moved to the CMakelists.txt in the root directory.
#endif //NANA_CONFIG_HPP