fix for libpng

2015-02-11 13:23:01 +01:00
parent 710ffb29ff
commit 73a5352796
2 changed files with 68 additions and 2 deletions
--- a/build/cmake/CMakeLists.txt
+++ b/build/cmake/CMakeLists.txt
@@ -1,50 +0,0 @@
-# CMake configuration for Nana
-# Author: ierofant(https://github.com/ierofant)
-
-project(nana)
-cmake_minimum_required(VERSION 2.8)
-
-string(REGEX REPLACE "/[^/]*$" "" CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-string(REGEX REPLACE "/[^/]*$" "" CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-
-set(NANA_SOURCE_DIR ${CMAKE_SOURCE_DIR}/source)
-set(NANA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
-
-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)
-
-add_library(${PROJECT_NAME} ${NANA_SOURCE}
-							${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})
-
-
-install(TARGETS ${PROJECT_NAME}
-			ARCHIVE DESTINATION lib
-			LIBRARY DESTINATION lib)
-install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include)
--- a/build/cmake/config.hpp
+++ b/build/cmake/config.hpp
@@ -0,0 +1,50 @@
+/*
+ *	Nana Configuration
+ *	Nana C++ Library(http://www.nanapro.org)
+ *	Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
+ *
+ *	Distributed under the Boost Software License, Version 1.0.
+ *	(See accompanying file LICENSE_1_0.txt or copy at
+ *	http://www.boost.org/LICENSE_1_0.txt)
+ *
+ *	@file: nana/config.hpp
+ */
+
+#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
+
+#endif	//NANA_CONFIG_HPP