Skip to content
Snippets Groups Projects
Commit 27f74b2f authored by Andreas Schenk's avatar Andreas Schenk
Browse files

fixed tiff include dir in master CMakeLists.txt

fixed lddt compilation on Windows
removed DLLEXPORTS from pdbsize.cc
parent 0b529365
Branches
Tags
No related merge requests found
...@@ -288,7 +288,7 @@ endif() ...@@ -288,7 +288,7 @@ endif()
include_directories(${Boost_INCLUDE_DIRS} include_directories(${Boost_INCLUDE_DIRS}
${FFTW_INCLUDE_DIRS} ${FFTW_INCLUDE_DIRS}
${EIGEN2_INCLUDE_DIRS} ${EIGEN2_INCLUDE_DIRS}
${TIFF_INCLUDE_DIRS} ${TIFF_INCLUDE_DIR}
${PNG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}
) )
if(USE_NUMPY) if(USE_NUMPY)
......
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <iomanip> #include <iomanip>
#if defined (_MSC_VER) #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 #endif
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
...@@ -142,9 +144,13 @@ CompoundLibPtr load_compound_lib(const String& custom_path) ...@@ -142,9 +144,13 @@ CompoundLibPtr load_compound_lib(const String& custom_path)
if (!_NSGetExecutablePath(result, &size)) { if (!_NSGetExecutablePath(result, &size)) {
exe_path=String(result); exe_path=String(result);
} }
#else #else
ssize_t count = readlink( "/proc/self/exe", result, 1024 ); #if defined (_MSC_VER)
exe_path = std::string( result, (count > 0) ? count : 0 ); // 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 #endif
if (exe_path.empty()) { if (exe_path.empty()) {
std::cerr << "Could not determine the path of the molck executable. Will only " std::cerr << "Could not determine the path of the molck executable. Will only "
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
namespace ost { namespace mol { namespace alg { namespace ost { namespace mol { namespace alg {
DLLEXPORT const char* POLYPEPTIDE_CHAIN_NAMES="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz"; const char* POLYPEPTIDE_CHAIN_NAMES="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
DLLEXPORT const char* LIGAND_CHAIN_NAME="_"; const char* LIGAND_CHAIN_NAME="_";
DLLEXPORT const char* WATER_CHAIN_NAME="-"; const char* WATER_CHAIN_NAME="-";
namespace { namespace {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment