compiling on windows working
This commit is contained in:
parent
d45b8954d2
commit
bb068d12e4
2
Makefile
2
Makefile
|
@ -6,7 +6,7 @@
|
||||||
# statdessen: `make clean; make all -j` verwenden
|
# statdessen: `make clean; make all -j` verwenden
|
||||||
|
|
||||||
# windows name
|
# windows name
|
||||||
# NAME = lib$(NAMESHORT).dll
|
NAME = lib$(NAMESHORT).dll
|
||||||
|
|
||||||
NAMESHORT = mrbesen
|
NAMESHORT = mrbesen
|
||||||
NAME ?= lib$(NAMESHORT).so
|
NAME ?= lib$(NAMESHORT).so
|
||||||
|
|
|
@ -65,6 +65,9 @@ template bool mrbesen::files::scan<std::set<std::string>>(const std::string&, st
|
||||||
template bool mrbesen::files::scan<std::multiset<std::string>>(const std::string&, std::insert_iterator<std::multiset<std::string>>, bool, fileNameFilter);
|
template bool mrbesen::files::scan<std::multiset<std::string>>(const std::string&, std::insert_iterator<std::multiset<std::string>>, bool, fileNameFilter);
|
||||||
|
|
||||||
bool mrbesen::files::scan(const std::string& path, fileCallback clb, bool prefixdir, fileNameFilter fnf) {
|
bool mrbesen::files::scan(const std::string& path, fileCallback clb, bool prefixdir, fileNameFilter fnf) {
|
||||||
|
#if defined(_WIN32) ||defined(_WIN64)
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
std::string path_ = path;
|
std::string path_ = path;
|
||||||
mrbesen::util::insertEnd(path_, "/");
|
mrbesen::util::insertEnd(path_, "/");
|
||||||
|
|
||||||
|
@ -91,6 +94,7 @@ bool mrbesen::files::scan(const std::string& path, fileCallback clb, bool prefix
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool mrbesen::files::readFile(const std::string& name, std::ostream& output, unsigned int maxsize) {
|
bool mrbesen::files::readFile(const std::string& name, std::ostream& output, unsigned int maxsize) {
|
||||||
|
|
Loading…
Reference in New Issue