.gitignore

@@ -50,6 +50,3 @@ cmake_install.cmake
 *.db
 *.opendb
 .vscode
-
-# objects
-*.o

SModule

@@ -1,44 +0,0 @@
-
-import json
-
-
-Import('env')
-
-nana_sources = []
-nana_sources += Glob('source/*.cpp')
-nana_sources += Glob('source/detail/*.cpp')
-nana_sources += Glob('source/detail/posix/*.cpp')
-nana_sources += Glob('source/filesystem/*.cpp')
-nana_sources += Glob('source/gui/*.cpp')
-nana_sources += Glob('source/gui/detail/*.cpp')
-nana_sources += Glob('source/gui/widgets/*.cpp')
-nana_sources += Glob('source/gui/widgets/skeletons/*.cpp')
-nana_sources += Glob('source/paint/*.cpp')
-nana_sources += Glob('source/paint/detail/*.cpp')
-nana_sources += Glob('source/system/*.cpp')
-nana_sources += Glob('source/threads/*.cpp')
-
-with open('dependencies.json', 'r') as f:
-  dependencies = env.DepsFromJson(json.load(f))
-
-
-cppflags = []
-if env['COMPILER_FAMILY'] == 'gcc':
-  cppflags += ['-Wno-changes-meaning', '-Wno-deprecated-declarations', '-Wno-deprecated-copy'] # TODO: get rid of these
-
-lib_nana = env.UnityStaticLibrary(
-    CXXFLAGS = env['CXXFLAGS'] + cppflags,
-    CPPPATH = env['CPPPATH'] + [env.Dir('include')],
-    target = env['LIB_DIR'] + '/nana',
-    source = nana_sources,
-    dependencies = dependencies,
-#    CPPDEFINES = list(env['CPPDEFINES']) + cppdefines
-)
-
-LIB_CONFIG = {
-    'CPPPATH': [env.Dir('include')],
-#    'CPPDEFINES': cppdefines,
-    'LIBS': [lib_nana]
-}
-
-Return('LIB_CONFIG')

dependencies.json

@@ -1,10 +0,0 @@
-{
-  "X11":
-  {
-	"condition": "target_os == 'posix'"
-  },
-  "Xft":
-  {
-	"condition": "target_os == 'posix'"
-  }
-}

source/detail/posix/xdnd_protocol.hpp

@@ -156,7 +156,7 @@ namespace nana{
 				    	for(auto& file : data.files)
 				    	{
 				    		uri_list += "file://";
-				    		uri_list += file.string();
+				    		uri_list += file.u8string();
 				    		uri_list += "\r\n";
 				    	}
 

source/gui/filebox.cpp

@@ -1013,7 +1013,7 @@ namespace nana
 				for(auto i = selection_.targets.cbegin(); i != selection_.targets.cend();)
 				{
 					std::filesystem::path p{*i};
-					if(p.filename().string() == mfs.name)
+					if(p.filename().u8string() == mfs.name)
 					{
 						if(!selection_.is_deselect_delayed)
 						{
@@ -1042,7 +1042,7 @@ namespace nana
 					if(!filename_string.empty())
 						filename_string += ' ';
 
-					filename_string += "\"" + p.filename().string() + "\"";
+					filename_string += "\"" + p.filename().u8string() + "\"";
 				}
 			}