mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix_mingw' of https://github.com/Pr0curo/nana into Pr0curo-fix_mingw

Browse Source
This commit is contained in:
Jinhao 2016-01-05 01:12:39 +08:00
commit 029b56e62d
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -7,7 +7,7 @@
#https://cmake.org/cmake-tutorial/ #https://cmake.org/cmake-tutorial/
#https://cmake.org/cmake/help/v3.3/module/CMakeDependentOption.html?highlight=cmakedependentoption #https://cmake.org/cmake/help/v3.3/module/CMakeDependentOption.html?highlight=cmakedependentoption
# use CACHE FORCE or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entirely build dir # use CACHE FORCE or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entirely build dir
# if your changes don't execute # if your changes don't execute
option(USE_meganz_mingw_std_threads "replaced boost.thread with meganz's mingw-std-threads." OFF) option(USE_meganz_mingw_std_threads "replaced boost.thread with meganz's mingw-std-threads." OFF)
option(USE_UNICODE "Use Unicode Character Set" ON) option(USE_UNICODE "Use Unicode Character Set" ON)
@ -143,16 +143,15 @@ 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}/system NANA_SYSTEM_SOURCE)
aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE) aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE)
#To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library #To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library
#and Use SOURCE_GROUP if all your sources are in the same directory #and Use SOURCE_GROUP if all your sources are in the same directory
if(NOT APPLE)
add_library(${PROJECT_NAME} ${NANA_SOURCE} add_library(${PROJECT_NAME} ${NANA_SOURCE}
${NANA_DETAIL_SOURCE} ${NANA_DETAIL_SOURCE}
${NANA_FILESYSTEM_SOURCE} ${NANA_FILESYSTEM_SOURCE}
if(NOT APPLE)
${NANA_AUDIO_SOURCE} ${NANA_AUDIO_SOURCE}
${NANA_AUDIO_DETAIL_SOURCE} ${NANA_AUDIO_DETAIL_SOURCE}
endif (NOT APPLE)
${NANA_GUI_SOURCE} ${NANA_GUI_SOURCE}
${NANA_GUI_DETAIL_SOURCE} ${NANA_GUI_DETAIL_SOURCE}
${NANA_GUI_WIDGETS_SOURCE} ${NANA_GUI_WIDGETS_SOURCE}
@ -160,11 +159,26 @@ endif (NOT APPLE)
${NANA_PAINT_SOURCE} ${NANA_PAINT_SOURCE}
${NANA_PAINT_DETAIL_SOURCE} ${NANA_PAINT_DETAIL_SOURCE}
${NANA_SYSTEM_SOURCE} ${NANA_SYSTEM_SOURCE}
${NANA_THREADS_SOURCE}) ${NANA_THREADS_SOURCE})
endif (NOT APPLE)
if(APPLE) if(APPLE)
#Headers: use INCLUDE_DIRECTORIES add_library(${PROJECT_NAME} ${NANA_SOURCE}
# Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES ${NANA_DETAIL_SOURCE}
${NANA_FILESYSTEM_SOURCE}
${NANA_AUDIO_SOURCE}
${NANA_AUDIO_DETAIL_SOURCE}
${NANA_GUI_SOURCE}
${NANA_GUI_DETAIL_SOURCE}
${NANA_GUI_WIDGETS_SOURCE}
${NANA_GUI_WIDGETS_SKELETONS_SOURCE}
${NANA_PAINT_SOURCE}
${NANA_PAINT_DETAIL_SOURCE}
${NANA_SYSTEM_SOURCE}
${NANA_THREADS_SOURCE})
#Headers: use INCLUDE_DIRECTORIES
# Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES
target_link_libraries(${PROJECT_NAME} -L/opt/X11/lib/ -lX11 -lXft -lpng -liconv) target_link_libraries(${PROJECT_NAME} -L/opt/X11/lib/ -lX11 -lXft -lpng -liconv)
endif(APPLE) endif(APPLE)

1
source/charset.cpp
View File

@ -18,6 +18,7 @@
#include <nana/deploy.hpp> #include <nana/deploy.hpp>
#include <cwchar> #include <cwchar>
#include <clocale> #include <clocale>
#include <cstring>
//GCC 4.7.0 does not implement the <codecvt> and codecvt_utfx classes //GCC 4.7.0 does not implement the <codecvt> and codecvt_utfx classes
#ifndef STD_CODECVT_NOT_SUPPORTED #ifndef STD_CODECVT_NOT_SUPPORTED