From 27f74b2f494fc7e8eb18d97d649a825df680f49d Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Wed, 30 Oct 2013 16:44:16 -0400
Subject: [PATCH] fixed tiff include dir in master CMakeLists.txt fixed lddt
compilation on Windows removed DLLEXPORTS from pdbsize.cc
---
CMakeLists.txt | 2 +-
modules/mol/alg/src/lddt.cc | 14 ++++++++++----
modules/mol/alg/src/pdbize.cc | 6 +++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a13110cab..5734b0259 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 c4c9ba5aa..90c6819df 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 9e3638358..1c523356a 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 {
--
GitLab