Merge branch 'develop' of https://github.com/qqiangwu/nana into qqiangwu-develop
Conflicts: include/nana/deploy.hpp source/deploy.cpp
This commit is contained in:
@@ -31,10 +31,11 @@
|
||||
#define NANA_X11 1
|
||||
#define PLATFORM_SPEC_HPP <nana/detail/linux_X11/platform_spec.hpp>
|
||||
#define STD_CODECVT_NOT_SUPPORTED
|
||||
#else
|
||||
# static_assert(false, "Only Windows and Unix are support now");
|
||||
#endif
|
||||
|
||||
//Here defines some flags that tell Nana what features will be supported.
|
||||
|
||||
#define NANA_UNICODE
|
||||
|
||||
#if defined(NANA_UNICODE) && defined(NANA_WINDOWS)
|
||||
|
||||
Reference in New Issue
Block a user