diff --git a/build/codeblocks/nana.cbp b/build/codeblocks/nana.cbp index 03e6b72f..49f61ad7 100644 --- a/build/codeblocks/nana.cbp +++ b/build/codeblocks/nana.cbp @@ -49,14 +49,16 @@ - + + - + + diff --git a/build/vc2013/nana.vcxproj b/build/vc2013/nana.vcxproj index 41477943..01db0e79 100644 --- a/build/vc2013/nana.vcxproj +++ b/build/vc2013/nana.vcxproj @@ -187,7 +187,7 @@ - + @@ -195,12 +195,12 @@ + - diff --git a/build/vc2013/nana.vcxproj.filters b/build/vc2013/nana.vcxproj.filters index 418bbf46..d2c700e8 100644 --- a/build/vc2013/nana.vcxproj.filters +++ b/build/vc2013/nana.vcxproj.filters @@ -25,9 +25,6 @@ {e2569be2-9e68-477d-8b59-e248595de6c7} - - {52ed7f8e-fa48-495e-af1f-4df013205a35} - {87d14798-9015-4162-b9ab-72c741cff063} @@ -37,9 +34,6 @@ {85c9c1bb-d87b-4481-bf3c-7425f680a12d} - - {8058b530-86ec-4d72-890d-345aa30db056} - {87b124cb-408d-460b-a81b-8a788bbae0d9} @@ -114,9 +108,6 @@ Source Files\nana\audio - - Source Files\nana\detail\win32 - Source Files\nana\filesystem @@ -126,9 +117,6 @@ Source Files\nana\filesystem - - Source Files\nana\gui\detail\win32 - Source Files\nana\gui\detail @@ -339,6 +327,12 @@ Source Files\nana\gui\widgets + + Source Files\nana\detail + + + Source Files\nana\gui\detail + diff --git a/build/vc2015/nana.sln b/build/vc2015/nana.sln index 6de06997..6aec89c0 100644 --- a/build/vc2015/nana.sln +++ b/build/vc2015/nana.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{98091380-2EC4-44B4-82A2-F0A6393BA908}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{25B21068-491B-4A9F-B99F-6C27BF31BAAD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.ActiveCfg = Debug|x64 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.Build.0 = Debug|x64 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.ActiveCfg = Debug|Win32 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.Build.0 = Debug|Win32 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.ActiveCfg = Release|x64 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.Build.0 = Release|x64 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.ActiveCfg = Release|Win32 - {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.Build.0 = Release|Win32 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.ActiveCfg = Debug|x64 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.Build.0 = Debug|x64 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.ActiveCfg = Debug|Win32 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.Build.0 = Debug|Win32 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.ActiveCfg = Release|x64 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.Build.0 = Release|x64 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.ActiveCfg = Release|Win32 + {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/vc2015/nana.vcxproj b/build/vc2015/nana.vcxproj index 0f5dd3d3..89ceaaa3 100644 --- a/build/vc2015/nana.vcxproj +++ b/build/vc2015/nana.vcxproj @@ -181,7 +181,7 @@ - + @@ -189,12 +189,12 @@ + - diff --git a/build/vc2015/nana.vcxproj.filters b/build/vc2015/nana.vcxproj.filters index fab8ae53..8130c2bc 100644 --- a/build/vc2015/nana.vcxproj.filters +++ b/build/vc2015/nana.vcxproj.filters @@ -37,18 +37,12 @@ {b3023f5e-2759-409d-b6e8-5ef2fe6601ae} - - {2ce139f3-ef8e-48b7-a82a-68003eac75da} - {b9f9a5a8-fd1a-4b99-b530-d8a4c45e62ec} {4b04c197-4a1e-41f9-bfa3-d82c18bcad51} - - {cd6e7f3f-fe5b-44c6-ae8d-15554f926055} - {60f588f2-bdb9-4b1d-9e23-40a73f327283} @@ -93,9 +87,6 @@ Source Files\audio - - Source Files\detail\win32 - Source Files\filesystem @@ -132,9 +123,6 @@ Source Files\gui\detail - - Source Files\gui\detail\win32 - Source Files\gui\widgets\skeletons @@ -294,5 +282,11 @@ Source Files\paint + + Source Files\detail + + + Source Files\gui\detail + \ No newline at end of file diff --git a/include/nana/config.hpp b/include/nana/config.hpp index 8f519e9b..d9ac719b 100644 --- a/include/nana/config.hpp +++ b/include/nana/config.hpp @@ -18,7 +18,7 @@ // Windows: #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) - #define NANA_WINDOWS 1 + #define NANA_WINDOWS // MINGW ... #if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW) @@ -31,24 +31,23 @@ // MacOS: who define APPLE ?? //#define APPLE #elif defined(APPLE) - #define NANA_MACOS 1 - #define NANA_X11 1 + #define NANA_MACOS + #define NANA_X11 // how to add this: include_directories(/opt/X11/include/) // end MacOS // Linux: (not sure about __GNU__ ??) #elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC) - #define NANA_LINUX 1 - #define NANA_X11 1 + #define NANA_LINUX + #define NANA_X11 // end Linux - - #else # static_assert(false, "Only Windows and Unix are supported now (Mac OS is experimental)"); #endif // Select platform #if defined(NANA_LINUX) || defined(NANA_MACOS) - #undef NANA_WINDOWS + #define NANA_POSIX + #undef NANA_WINDOWS #endif // End Select platform ...... diff --git a/include/nana/filesystem/file_iterator.hpp b/include/nana/filesystem/file_iterator.hpp index b884638f..94f37001 100644 --- a/include/nana/filesystem/file_iterator.hpp +++ b/include/nana/filesystem/file_iterator.hpp @@ -38,7 +38,7 @@ namespace filesystem fileinfo(); #ifdef NANA_WINDOWS fileinfo(const WIN32_FIND_DATA& wfd); -#elif NANA_LINUX or NANA_MACOS +#elif defined(NANA_POSIX) fileinfo(const nana::string& filename, const struct stat &); #endif nana::string name; diff --git a/source/detail/linux_X11/platform_spec.cpp b/source/detail/platform_spec_posix.cpp similarity index 99% rename from source/detail/linux_X11/platform_spec.cpp rename to source/detail/platform_spec_posix.cpp index 43fde207..33d81a75 100644 --- a/source/detail/linux_X11/platform_spec.cpp +++ b/source/detail/platform_spec_posix.cpp @@ -15,6 +15,7 @@ */ #include +#if defined(NANA_POSIX) && defined(NANA_X11) #include #include #include @@ -28,7 +29,7 @@ #include #include -#include "msg_dispatcher.hpp" +#include "x11/msg_dispatcher.hpp" namespace nana { @@ -1412,3 +1413,4 @@ namespace detail } }//end namespace detail }//end namespace nana +#endif //NANA_POSIX && NANA_X11 diff --git a/source/detail/platform_spec_selector.cpp b/source/detail/platform_spec_selector.cpp deleted file mode 100644 index b09fbfe4..00000000 --- a/source/detail/platform_spec_selector.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Platform Specification Selector - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) - * - * Distributed under the Nana Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://nanapro.org/LICENSE_1_0.txt) - * - * @file: nana/detail/platform_spec_selector.cpp - * - * This file is used to support the Nana project of some cross-platform IDE, - * - */ - -#include - -#if defined(NANA_WINDOWS) - #include "win32/platform_spec.cpp" -#elif defined(NANA_LINUX) || defined(NANA_MACOS) - #include "linux_X11/platform_spec.cpp" -#endif \ No newline at end of file diff --git a/source/detail/win32/platform_spec.cpp b/source/detail/platform_spec_windows.cpp similarity index 99% rename from source/detail/win32/platform_spec.cpp rename to source/detail/platform_spec_windows.cpp index f7ac9917..0323dfc1 100644 --- a/source/detail/win32/platform_spec.cpp +++ b/source/detail/platform_spec_windows.cpp @@ -13,6 +13,9 @@ */ #include + +#if defined(NANA_WINDOWS) + #include #include @@ -290,3 +293,5 @@ namespace detail } }//end namespace detail }//end namespace nana + +#endif //NANA_WINDOWS diff --git a/source/detail/linux_X11/msg_dispatcher.hpp b/source/detail/x11/msg_dispatcher.hpp similarity index 100% rename from source/detail/linux_X11/msg_dispatcher.hpp rename to source/detail/x11/msg_dispatcher.hpp diff --git a/source/gui/detail/linux_X11/bedrock.cpp b/source/gui/detail/bedrock_posix.cpp similarity index 99% rename from source/gui/detail/linux_X11/bedrock.cpp rename to source/gui/detail/bedrock_posix.cpp index 5a69ab34..ad8a8508 100644 --- a/source/gui/detail/linux_X11/bedrock.cpp +++ b/source/gui/detail/bedrock_posix.cpp @@ -11,6 +11,7 @@ */ #include +#if defined(NANA_POSIX) && defined(NANA_X11) #include #include #include @@ -1399,3 +1400,4 @@ namespace detail } }//end namespace detail }//end namespace nana +#endif //NANA_POSIX && NANA_X11 \ No newline at end of file diff --git a/source/gui/detail/bedrock_selector.cpp b/source/gui/detail/bedrock_selector.cpp deleted file mode 100644 index 986d3538..00000000 --- a/source/gui/detail/bedrock_selector.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Bedrock Selector - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) - * - * Distributed under the Nana Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://nanapro.sourceforge.net/LICENSE_1_0.txt) - * - * @file: nana/gui/detail/bedrock_selector.cpp - * - * This file is used to support the Nana project of some cross-platform IDE, - * - */ - -#include - -#if defined(NANA_WINDOWS) - #include "win32/bedrock.cpp" -#elif defined(NANA_LINUX) || defined(NANA_MACOS) - #include "linux_X11/bedrock.cpp" -#endif - diff --git a/source/gui/detail/win32/bedrock.cpp b/source/gui/detail/bedrock_windows.cpp similarity index 99% rename from source/gui/detail/win32/bedrock.cpp rename to source/gui/detail/bedrock_windows.cpp index 7cdd1b5f..eb48b9e9 100644 --- a/source/gui/detail/win32/bedrock.cpp +++ b/source/gui/detail/bedrock_windows.cpp @@ -12,6 +12,7 @@ */ #include +#if defined(NANA_WINDOWS) #include #include #include @@ -1894,3 +1895,4 @@ namespace detail } }//end namespace detail }//end namespace nana +#endif //NANA_WINDOWS