initial commit with updated Makefile and removing native string worki…

…ng on ubuntu
laeeq80 · Oct 4, 2017 · 0b8ea88 · 0b8ea88
1 parent 9c14cc7
commit 0b8ea88
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/build/linux/debug/Makefile b/build/linux/debug/Makefile
@@ -1,9 +1,7 @@
-BASE=/home/xouyang1/boost
-BOOST_VERSION=1_41
-BOOST_INCLUDE = $(BASE)/include
+BOOST_INCLUDE=/usr/lib/x86_64-linux-gnu/
 C_PLATFORM=-static -pthread
-GPP=g++
-C_OPTIONS= -g
-BOOST_LIB_VERSION=
+GPP=/usr/bin/g++
+C_OPTIONS= -O3 -g
 
 include ../../makefile_common
+# DO NOT DELETE
diff --git a/build/linux/release/Makefile b/build/linux/release/Makefile
@@ -1,9 +1,7 @@
-BASE=/home/xouyang1/boost
-BOOST_VERSION=1_41
-BOOST_INCLUDE = $(BASE)/include
+BOOST_INCLUDE=/usr/lib/x86_64-linux-gnu/
 C_PLATFORM=-static -pthread
-GPP=g++
-C_OPTIONS= -O3 -DNDEBUG
-BOOST_LIB_VERSION=
+GPP=/usr/bin/g++
+C_OPTIONS= -O3 -g
 
 include ../../makefile_common
+# DO NOT DELETE
diff --git a/build/makefile_common b/build/makefile_common
@@ -10,7 +10,8 @@ CC = ${GPP} ${C_PLATFORM} -ansi -Wno-long-long ${C_OPTIONS} $(INCFLAGS)
 
 LDFLAGS = -L$(BASE)/lib -L.
 
-LIBS = -l boost_system${BOOST_LIB_VERSION} -l boost_thread${BOOST_LIB_VERSION} -l boost_serialization${BOOST_LIB_VERSION} -l boost_filesystem${BOOST_LIB_VERSION} -l boost_program_options${BOOST_LIB_VERSION}#-l pthread
+LIBS = -l boost_system${BOOST_LIB_VERSION} -l boost_thread${BOOST_LIB_VERSION} -l boost_program_options${BOOST_LIB_VERSION} -lboost_filesystem${BOOST_LIB_VERSION} #-l pthread
+
 
 .SUFFIXES: .cpp .o
 

diff --git a/src/main/main.cpp b/src/main/main.cpp
@@ -50,7 +50,7 @@ using boost::filesystem::path;
 using namespace boost::posix_time;
 
 path make_path(const std::string& str) {
-	return path(str, boost::filesystem::native);
+	return path(str);
 }
 
 void doing(int verbosity, const std::string& str, tee& log) {
@@ -684,7 +684,7 @@ Thank you!\n";
 					cpu, seed, verbosity, max_modes_sz, energy_range, log);
 	}
 	catch(file_error& e) {
-		std::cerr << "\n\nError: could not open \"" << e.name.native_file_string() << "\" for " << (e.in ? "reading" : "writing") << ".\n";
+		std::cerr << "\n\nError: could not open \"" << e.name.string() << "\" for " << (e.in ? "reading" : "writing") << ".\n";
 		return 1;
 	}
 	catch(boost::filesystem::filesystem_error& e) {
@@ -696,7 +696,7 @@ Thank you!\n";
 		return 1;
 	}
 	catch(parse_error& e) {
-		std::cerr << "\n\nParse error on line " << e.line << " in file \"" << e.file.native_file_string() << "\": " << e.reason << '\n';
+		std::cerr << "\n\nParse error on line " << e.line << " in file \"" << e.file.string() << "\": " << e.reason << '\n';
 		return 1;
 	}
 	catch(std::bad_alloc&) {

diff --git a/src/split/split.cpp b/src/split/split.cpp
@@ -38,7 +38,7 @@
 using boost::filesystem::path;
 
 path make_path(const std::string& str) {
-	return path(str, boost::filesystem::native);
+	return path(str);
 }
 
 std::string default_prefix(const std::string& input_name, const std::string& add) {
@@ -208,7 +208,7 @@ Thank you!\n";
 		write_multimodel_pdbqt(tmp, ligand_prefix, flex_prefix);
 	}
 	catch(file_error& e) {
-		std::cerr << "\n\nError: could not open \"" << e.name.native_file_string() << "\" for " << (e.in ? "reading" : "writing") << ".\n";
+		std::cerr << "\n\nError: could not open \"" << e.name.string() << "\" for " << (e.in ? "reading" : "writing") << ".\n";
 		return 1;
 	}
 	catch(boost::filesystem::filesystem_error& e) {
@@ -220,7 +220,7 @@ Thank you!\n";
 		return 1;
 	}
 	catch(parse_error& e) {
-		std::cerr << "\n\nParse error on line " << e.line << " in file \"" << e.file.native_file_string() << "\": " << e.reason << '\n';
+		std::cerr << "\n\nParse error on line " << e.line << " in file \"" << e.file.string() << "\": " << e.reason << '\n';
 		return 1;
 	}
 	catch(std::bad_alloc&) {