fix mingw compilation error

.gitignore

@@ -2,6 +2,8 @@
 #ignore thumbnails created by windows
 Thumbs.db
 #Ignore files build by Visual Studio
+bii/build/*
+bii/cmake/*
 *.obj
 *.exe
 *.pdb
@@ -28,3 +30,5 @@ _ReSharper*/
 [Tt]est[Rr]esult*
 *.suo
 *.sdf
+
+bii/.hive.db

CMakeLists.txt

@@ -2,10 +2,22 @@
 # Author: Andrew Kornilov(https://github.com/ierofant)
 # Contributor:
 #	Robert Hauck - Enable support for PNG/Freetype
+#   Qiangqiang Wu - Add biicode support
 
-project(nana)
-cmake_minimum_required(VERSION 2.8)
+if(NOT BIICODE)
+    project(nana)
+    cmake_minimum_required(VERSION 2.8)
+else()
+    set(LIB_SRC ${BII_LIB_SRC})
     
+    foreach(cpp ${BII_LIB_SRC})
+        if(${cpp} MATCHES "(include/nana|source)/detail/[A-Za-z0-9_]+/.+$")
+            list(APPEND trash_files ${cpp})
+        endif()
+    endforeach()
+
+    list(REMOVE_ITEM BII_LIB_SRC ${trash_files})
+endif()
 
 #Select platform automatically
 if(WIN32)
@@ -21,12 +33,21 @@ if(WIN32)
 			add_definitions(-DSTD_THREAD_NOT_SUPPORTED)
 		endif()
 	endif()
+    
+    if(BIICODE)
+        file(GLOB_RECURSE platform_files "*/detail/win32/*")
+        list(APPEND BII_LIB_SRC ${platform_files})
+    endif()
 endif()
 if(UNIX)
 	add_definitions(-DNANA_LINUX)
 	add_definitions(-DNANA_X11)
 	add_definitions(-DPLATFORM_SPEC_HPP=<nana/detail/linux_X11/platform_spec.hpp>)
 	add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
+    if(BIICODE)
+        file(GLOB_RECURSE platform_files "*/detail/linux_X11/*")
+        list(APPEND BII_LIB_SRC ${platform_files})
+    endif()
 endif()
 
 
@@ -55,16 +76,17 @@ if(NANA_UNICODE)
 endif()
 
 
-#Find PNG
-if(UNIX)
+if(NOT BIICODE)
+    #Find PNG
+    if(UNIX)
         find_package(Freetype)
         if (FREETYPE_FOUND)
             include_directories( ${FREETYPE_INCLUDE_DIRS})
         endif()
-endif()
+    endif()
 
-option(NANA_ENABLE_PNG "Enable the use of PNG" ON)
-if(NANA_ENABLE_PNG)
+    option(NANA_ENABLE_PNG "Enable the use of PNG" ON)
+    if(NANA_ENABLE_PNG)
         add_definitions(-DNANA_ENABLE_PNG)
 
         option(NANA_LIBPNG "Use the included libpng" ON)
@@ -76,37 +98,41 @@ if(NANA_ENABLE_PNG)
                 include_directories( ${PNG_INCLUDE_DIRS})
             endif()
         endif()
+    endif()
+else()
+    add_definitions(-DNANA_LIBPNG)
+    add_definitions(-DNANA_ENABLE_PNG)
 endif()
 
-
-
 #Copy our new config.hpp (with removed defines)
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/build/cmake/config.hpp ${CMAKE_SOURCE_DIR}/include/nana/)
-
-
-set(NANA_SOURCE_DIR ${CMAKE_SOURCE_DIR}/source)
-set(NANA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/nana/)
     
 if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-include_directories(${NANA_INCLUDE_DIR})
-aux_source_directory(${NANA_SOURCE_DIR} NANA_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/detail NANA_DETAIL_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/filesystem NANA_FILESYSTEM_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/audio NANA_AUDIO_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/audio/detail NANA_AUDIO_DETAIL_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/gui NANA_GUI_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/gui/detail NANA_GUI_DETAIL_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets NANA_GUI_WIDGETS_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets/skeletons NANA_GUI_WIDGETS_SKELETONS_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/paint NANA_PAINT_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/paint/detail NANA_PAINT_DETAIL_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/system NANA_SYSTEM_SOURCE)
-aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE)
+if(BIICODE)
+    add_biicode_targets()
+else()
+    set(NANA_SOURCE_DIR ${CMAKE_SOURCE_DIR}/source)
+    set(NANA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
 
-add_library(${PROJECT_NAME} ${NANA_SOURCE}
+    include_directories(${NANA_INCLUDE_DIR})
+    aux_source_directory(${NANA_SOURCE_DIR} NANA_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/detail NANA_DETAIL_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/filesystem NANA_FILESYSTEM_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/audio NANA_AUDIO_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/audio/detail NANA_AUDIO_DETAIL_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/gui NANA_GUI_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/gui/detail NANA_GUI_DETAIL_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets NANA_GUI_WIDGETS_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/gui/widgets/skeletons NANA_GUI_WIDGETS_SKELETONS_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/paint NANA_PAINT_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/paint/detail NANA_PAINT_DETAIL_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/system NANA_SYSTEM_SOURCE)
+    aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE)
+
+    add_library(${PROJECT_NAME} ${NANA_SOURCE}
                                 ${NANA_DETAIL_SOURCE}
                                 ${NANA_FILESYSTEM_SOURCE}
                                 ${NANA_AUDIO_SOURCE}
@@ -119,9 +145,8 @@ add_library(${PROJECT_NAME} ${NANA_SOURCE}
                                 ${NANA_PAINT_DETAIL_SOURCE}
                                 ${NANA_SYSTEM_SOURCE}
                                 ${NANA_THREADS_SOURCE})                        
-
-
-install(TARGETS ${PROJECT_NAME}
+    install(TARGETS ${PROJECT_NAME}
                 ARCHIVE DESTINATION lib
                 LIBRARY DESTINATION lib)
-install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include)
+    install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include)
+endif()

README.md

@@ -1,4 +1,5 @@
 # Nana C++ Library
+[![Build Status](https://webapi.biicode.com/v1/badges/qiangwu/qiangwu/nana/master)](https://www.biicode.com/qiangwu/nana) 
 
 Nana is a C++ library designed to allow developers to easily create cross-platform GUI applications with modern C++11 style, currently it can work on Linux(X11) and Windows. The nana repository contains the entire source of library, you can browse the source code and submit your pull request for contributing.
 

bii/layout.bii

@@ -0,0 +1,12 @@
+ # Minimal layout, with all auxiliary folders inside "bii" and
+# The binary "bin" folder as is, and enabled code edition in the project root
+cmake: bii/cmake
+lib: bii/lib
+build: bii/build
+
+deps: bii/deps
+# Setting this to True enables directly editing in the project root
+# instead of blocks/youruser/yourblock
+# the block will be named as your project folder
+auto-root-block: True
+root-block: qiangwu/nana

bii/policies.bii

@@ -0,0 +1,11 @@
+# This file configures your finds of dependencies.
+#
+# It is an ordered list of rules, which will be evaluated in order, of the form:
+#     block_pattern: TAG
+#
+# For each possible block that could resolve your dependencies,
+# only versions with tag >= TAG will be accepted
+
+qiangwu/* : DEV
+* : STABLE
+

bii/settings.bii

@@ -0,0 +1,2 @@
+cmake: {generator: MinGW Makefiles}
+os: {arch: 32bit, family: Windows, subfamily: '7', version: 6.1.7601}

biicode.conf

@@ -0,0 +1,49 @@
+# Biicode configuration file
+
+[requirements]
+    # Blocks and versions this block depends on e.g.
+    # user/depblock1: 3
+    # user2/depblock2(track) @tag
+
+[parent]
+    # The parent version of this block. Must match folder name. E.g.
+    # user/block  # No version number means not published yet
+    # You can change it to publish to a different track, and change version, e.g.
+    # user/block(track): 7
+    qiangwu/nana: 0
+
+[paths]
+    # Local directories to look for headers (within block)
+    # /
+    include
+
+[dependencies]
+    # Manual adjust file implicit dependencies, add (+), remove (-), or overwrite (=)
+    # hello.h + hello_imp.cpp hello_imp2.cpp
+    # *.h + *.cpp
+    include/nana/config.hpp + build/cmake/config.hpp
+
+[mains]
+    # Manual adjust of files that define an executable
+    # !main.cpp  # Do not build executable from this file
+    # main2.cpp # Build it (it doesnt have a main() function, but maybe it includes it)
+
+[tests]
+    # Manual adjust of files that define a CTest test
+    # test/* pattern to evaluate this test/ folder sources like tests
+
+[hooks]
+    # These are defined equal to [dependencies],files names matching bii*stage*hook.py
+    # will be launched as python scripts at stage = {post_process, clean}
+    # CMakeLists.txt + bii/my_post_process1_hook.py bii_clean_hook.py
+
+[includes]
+    # Mapping of include patterns to external blocks
+    # hello*.h: user3/depblock  # includes will be processed as user3/depblock/hello*.h
+
+[data]
+    # Manually define data files dependencies, that will be copied to bin for execution
+    # By default they are copied to bin/user/block/... which should be taken into account
+    # when loading from disk such data
+    # image.cpp + image.jpg  # code should write open("user/block/image.jpg")
+

include/nana/deploy.hpp

@@ -15,6 +15,8 @@
 #ifndef NANA_DEPLOY_HPP
 #define NANA_DEPLOY_HPP
 
+#include <stdexcept>
+
 #include <nana/config.hpp>
 #include <nana/charset.hpp>
 #if defined(NANA_LINUX)
@@ -22,7 +24,7 @@
 #endif
 
 //Implement workarounds for MinGW
-#if defined(NANA_MINGW)
+#if defined(NANA_MINGW) && __GNUC_MINOR__ < 8
 namespace std
 {
 	//Workaround for no implemenation of std::stoi in MinGW.

include/nana/std_thread.hpp

@@ -2,7 +2,7 @@
 #define NANA_STD_THREAD_HPP
 #include <nana/config.hpp>
 
-#if defined(NANA_MINGW)
+#if defined(STD_THREAD_NOT_SUPPORTED)
 #include <boost/thread.hpp>
 namespace std
 {

source/deploy.cpp

@@ -23,7 +23,7 @@
 	#include PLATFORM_SPEC_HPP
 #endif
 
-#if defined(NANA_MINGW)
+#if defined(NANA_MINGW) && __GNUC_MINOR__ < 8
 #include <sstream>
 namespace std
 {

source/detail/platform_spec_selector.cpp

@@ -20,4 +20,3 @@
 #elif defined(NANA_LINUX)
 	#include "linux_X11/platform_spec.cpp"
 #endif
-