diff --git a/CMakeLists.txt b/CMakeLists.txt index a13110cab564821b05adb310e1ae04aa44962d2e..5734b025910a9243ad0f9cdb799e2306066d9534 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,7 +288,7 @@ endif() include_directories(${Boost_INCLUDE_DIRS} ${FFTW_INCLUDE_DIRS} ${EIGEN2_INCLUDE_DIRS} - ${TIFF_INCLUDE_DIRS} + ${TIFF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ) if(USE_NUMPY) diff --git a/modules/mol/alg/src/lddt.cc b/modules/mol/alg/src/lddt.cc index c4c9ba5aa5512c4749a26e74a2349b21e4a9313a..90c6819dfb6974e902ca02ef908aad8492f8fac2 100644 --- a/modules/mol/alg/src/lddt.cc +++ b/modules/mol/alg/src/lddt.cc @@ -18,7 +18,9 @@ //------------------------------------------------------------------------------ #include <iomanip> #if defined (_MSC_VER) -#define BOOST_ALL_DYN_LINK 1 + #define BOOST_ALL_DYN_LINK 1 + #include <BaseTsd.h> + typedef SSIZE_T ssize_t; #endif #include <boost/program_options.hpp> #include <boost/filesystem/fstream.hpp> @@ -142,9 +144,13 @@ CompoundLibPtr load_compound_lib(const String& custom_path) if (!_NSGetExecutablePath(result, &size)) { exe_path=String(result); } - #else - ssize_t count = readlink( "/proc/self/exe", result, 1024 ); - exe_path = std::string( result, (count > 0) ? count : 0 ); + #else + #if defined (_MSC_VER) + // todo find exe path on Windows + #else + ssize_t count = readlink( "/proc/self/exe", result, 1024 ); + exe_path = std::string( result, (count > 0) ? count : 0 ); + #endif #endif if (exe_path.empty()) { std::cerr << "Could not determine the path of the molck executable. Will only " diff --git a/modules/mol/alg/src/pdbize.cc b/modules/mol/alg/src/pdbize.cc index 9e3638358356ecbe3e817c31466b448a8cc97f1f..1c523356ae496e0a5e2cba54838adbd0da7dc83c 100644 --- a/modules/mol/alg/src/pdbize.cc +++ b/modules/mol/alg/src/pdbize.cc @@ -29,9 +29,9 @@ namespace ost { namespace mol { namespace alg { -DLLEXPORT const char* POLYPEPTIDE_CHAIN_NAMES="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz"; -DLLEXPORT const char* LIGAND_CHAIN_NAME="_"; -DLLEXPORT const char* WATER_CHAIN_NAME="-"; +const char* POLYPEPTIDE_CHAIN_NAMES="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz"; +const char* LIGAND_CHAIN_NAME="_"; +const char* WATER_CHAIN_NAME="-"; namespace {