1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
Fixes all the little issues with that new version. This is some kind of
joke, isn't it? Did they even test the stuff? Ah well...
---
diff -urpN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2019-04-10 14:56:59.945587369 +0200
+++ b/CMakeLists.txt 2019-04-10 16:03:20.072383378 +0200
@@ -22,10 +22,10 @@
# cmake 3.12 have more better modern c++ support
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
-project(nana VERSION 1.6.2
+project(nana VERSION 1.7.0
DESCRIPTION "C++ GUI library"
HOMEPAGE_URL http://nanapro.org
- LANGUAGES CXX )
+ LANGUAGES CXX)
####################### Main setting of Nana targets, sources and installs #####################
diff -urpN a/build/cmake/compilers.cmake b/build/cmake/compilers.cmake
--- a/build/cmake/compilers.cmake 2019-04-10 14:56:59.945587369 +0200
+++ b/build/cmake/compilers.cmake 2019-04-10 15:53:36.754700500 +0200
@@ -15,7 +15,7 @@
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # AND NOT MINGW??
target_compile_options(nana PRIVATE -Wall
- PUBLIC -g )
+ PUBLIC -Os -s)
set(THREADS_PREFER_PTHREAD_FLAG ON) # todo - test this
find_package(Threads REQUIRED)
diff -urpN a/build/cmake/enable_audio.cmake b/build/cmake/enable_audio.cmake
--- a/build/cmake/enable_audio.cmake 2019-04-10 14:56:59.945587369 +0200
+++ b/build/cmake/enable_audio.cmake 2019-04-10 16:06:33.163862315 +0200
@@ -4,12 +4,12 @@ option(NANA_CMAKE_ENABLE_AUDIO "Enable c
if(NANA_CMAKE_ENABLE_AUDIO)
target_compile_definitions(nana PUBLIC NANA_ENABLE_AUDIO)
if(UNIX)
- find_package(ASOUND) # ? https://github.com/hintjens/demidi/blob/master/Findasound.cmake
- if(ASOUND_FOUND)
- target_include_directories(nana PUBLIC ${ASOUND_INCLUDE_DIRS})
- target_link_libraries(nana PUBLIC ${ASOUND_LIBRARIES})
+ find_package(ALSA) # ? https://github.com/hintjens/demidi/blob/master/Findasound.cmake
+ if(ALSA_FOUND)
+ target_include_directories(nana PUBLIC ${ALSA_INCLUDE_DIRS})
+ target_link_libraries(nana PUBLIC ${ALSA_LIBRARIES})
else()
message(FATAL_ERROR "libasound is not found")
endif()
endif()
-endif()
\ No newline at end of file
+endif()
diff -urpN a/source/filesystem/filesystem.cpp b/source/filesystem/filesystem.cpp
--- a/source/filesystem/filesystem.cpp 2019-04-10 14:56:59.948920713 +0200
+++ b/source/filesystem/filesystem.cpp 2019-04-10 15:01:55.913333313 +0200
@@ -40,7 +40,7 @@
#include <dirent.h>
#include <cstdio>
#include <cstring>
- #include <errno.h>
+ #include <cerrno>
#include <unistd.h>
#include <stdlib.h>
#endif
@@ -1045,7 +1045,7 @@ namespace nana { namespace experimental
::fclose(stream);
return bytes;
}
- ec.assign(static_cast<int>(::errno), std::generic_category());
+ ec.assign(static_cast<int>(errno), std::generic_category());
#endif
return static_cast<std::uintmax_t>(-1);
}
@@ -1056,7 +1056,7 @@ namespace nana { namespace experimental
struct tm t;
nana::filesystem_ext::modified_file_time(p, t);
std::chrono::system_clock::time_point dateTime =std::chrono::system_clock::from_time_t( mktime(&t) );
- return dateTime;
+ return dateTime;
}
bool create_directory(const path& p)
|