Fixed compilation errors on Windows

platforms/opencl/src/OpenCLBondedUtilities.h

@@ -78,7 +78,7 @@ namespace OpenMM {
  * from your interaction code.
  */
 
-class OPENMM_EXPORT OpenCLBondedUtilities {
+class OPENMM_EXPORT_OPENCL OpenCLBondedUtilities {
 public:
     OpenCLBondedUtilities(OpenCLContext& context);
     ~OpenCLBondedUtilities();

platforms/opencl/src/OpenCLCompact.h

@@ -29,7 +29,7 @@
 
 namespace OpenMM {
 
-class OPENMM_EXPORT OpenCLCompact {
+class OPENMM_EXPORT_OPENCL OpenCLCompact {
 public:
     OpenCLCompact(OpenCLContext& context);
     ~OpenCLCompact();

platforms/opencl/src/OpenCLContext.h

@@ -37,7 +37,7 @@
     #define NOMINMAX
 #endif
 #include <cl.hpp>
-#include "openmm/internal/windowsExport.h"
+#include "windowsExportOpenCL.h"
 #include "OpenCLPlatform.h"
 
 namespace OpenMM {
@@ -153,7 +153,7 @@ struct mm_int16 {
  * thread is not used and calculations are performed on the main application thread.
  */
 
-class OPENMM_EXPORT OpenCLContext {
+class OPENMM_EXPORT_OPENCL OpenCLContext {
 public:
     class WorkTask;
     class WorkThread;

platforms/opencl/src/OpenCLExpressionUtilities.h

@@ -43,7 +43,7 @@ namespace OpenMM {
  * user defined mathematical expressions.
  */
 
-class OPENMM_EXPORT OpenCLExpressionUtilities {
+class OPENMM_EXPORT_OPENCL OpenCLExpressionUtilities {
 public:
     OpenCLExpressionUtilities(OpenCLContext& context) : context(context) {
     }

platforms/opencl/src/OpenCLFFT3D.h

@@ -52,7 +52,7 @@ namespace OpenMM {
  * multiply every value of the original data set by the total number of data points.
  */
 
-class OPENMM_EXPORT OpenCLFFT3D {
+class OPENMM_EXPORT_OPENCL OpenCLFFT3D {
 public:
     /**
      * Create an OpenCLFFT3D object for performing transforms of a particular size.

platforms/opencl/src/OpenCLForceInfo.h

@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  * -------------------------------------------------------------------------- */
 
-#include "openmm/internal/windowsExport.h"
+#include "windowsExportOpenCL.h"
 #include <vector>
 
 namespace OpenMM {
@@ -37,7 +37,7 @@ namespace OpenMM {
  * about the behavior and requirements of that force.
  */
 
-class OPENMM_EXPORT OpenCLForceInfo {
+class OPENMM_EXPORT_OPENCL OpenCLForceInfo {
 public:
     OpenCLForceInfo(int requiredForceBuffers) : requiredForceBuffers(requiredForceBuffers) {
     }

platforms/opencl/src/OpenCLIntegrationUtilities.h

@@ -29,7 +29,7 @@
 
 #include "openmm/System.h"
 #include "OpenCLContext.h"
-#include "openmm/internal/windowsExport.h"
+#include "windowsExportOpenCL.h"
 #include <iosfwd>
 
 namespace OpenMM {
@@ -39,7 +39,7 @@ namespace OpenMM {
  * common workspace arrays, random number generation, and enforcing constraints.
  */
 
-class OPENMM_EXPORT OpenCLIntegrationUtilities {
+class OPENMM_EXPORT_OPENCL OpenCLIntegrationUtilities {
 public:
     OpenCLIntegrationUtilities(OpenCLContext& context, const System& system);
     ~OpenCLIntegrationUtilities();

platforms/opencl/src/OpenCLKernelSources.h.in

@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.      *
  * -------------------------------------------------------------------------- */
 
-#include "openmm/internal/windowsExport.h"
+#include "windowsExportOpenCL.h"
 #include <string>
 
 namespace OpenMM {
@@ -38,7 +38,7 @@ namespace OpenMM {
  * kernels subfolder.
  */
 
-class OPENMM_EXPORT OpenCLKernelSources {
+class OPENMM_EXPORT_OPENCL OpenCLKernelSources {
 public:
 @CL_FILE_DECLARATIONS@
 };

platforms/opencl/src/OpenCLNonbondedUtilities.h

@@ -61,7 +61,7 @@ namespace OpenMM {
  * by ForceImpls during calcForcesAndEnergy().
  */
 
-class OPENMM_EXPORT OpenCLNonbondedUtilities {
+class OPENMM_EXPORT_OPENCL OpenCLNonbondedUtilities {
 public:
     class ParameterInfo;
     OpenCLNonbondedUtilities(OpenCLContext& context);

platforms/opencl/src/OpenCLParameterSet.h

@@ -40,7 +40,7 @@ class OpenCLNonbondedUtilities;
  * on the number of parameters required.
  */
 
-class OPENMM_EXPORT OpenCLParameterSet {
+class OPENMM_EXPORT_OPENCL OpenCLParameterSet {
 public:
     /**
      * Create an OpenCLParameterSet.

platforms/opencl/src/OpenCLPlatform.cpp

@@ -39,7 +39,7 @@ using std::string;
 using std::stringstream;
 using std::vector;
 
-extern "C" OPENMM_EXPORT void registerPlatforms() {
+extern "C" OPENMM_EXPORT_OPENCL void registerPlatforms() {
     Platform::registerPlatform(new OpenCLPlatform());
 }
 

platforms/opencl/src/OpenCLSort.h

@@ -29,7 +29,7 @@
 
 #include "OpenCLArray.h"
 #include "OpenCLKernelSources.h"
-#include "openmm/internal/windowsExport.h"
+#include "windowsExportOpenCL.h"
 #include <map>
 
 namespace OpenMM {

plugins/amoeba/CMakeLists.txt

@@ -111,11 +111,11 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 ADD_LIBRARY(${SHARED_AMOEBA_TARGET} SHARED ${SOURCE_AMOEBA_FILES} ${SOURCE_AMOEBA_INCLUDE_FILES} ${API_AMOEBA_ABS_INCLUDE_FILES})
-SET_TARGET_PROPERTIES(${SHARED_AMOEBA_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY")
+SET_TARGET_PROPERTIES(${SHARED_AMOEBA_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_AMOEBA_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY")
 
 IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
     ADD_LIBRARY(${SHARED_AMOEBA_SERIALIZABLE_TARGET} SHARED ${SOURCE_AMOEBA_FILES} ${SOURCE_AMOEBA_INCLUDE_FILES} ${API_AMOEBA_ABS_INCLUDE_FILES})
-    SET_TARGET_PROPERTIES(${SHARED_AMOEBA_SERIALIZABLE_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DOPENMM_SERIALIZE")
+    SET_TARGET_PROPERTIES(${SHARED_AMOEBA_SERIALIZABLE_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_AMOEBA_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DOPENMM_SERIALIZE")
     INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../serialization/include)
 ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
 

plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/Force.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include <vector>
 
 namespace OpenMM {
@@ -48,7 +48,7 @@ namespace OpenMM {
  * an angle has been added, you can modify its force field parameters by calling setAngleParameters().
  */
 
-class OPENMM_EXPORT AmoebaAngleForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaAngleForce : public Force {
 
 public:
 

plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h

@@ -34,7 +34,7 @@
 
 #include "openmm/Force.h"
 #include "openmm/Vec3.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include <map>
 #include <vector>
 
@@ -50,7 +50,7 @@ namespace OpenMM {
  * a bond has been added, you can modify its force field parameters by calling setBondParameters().
  */
 
-class OPENMM_EXPORT AmoebaBondForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaBondForce : public Force {
 
 public:
 

plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/Force.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include <vector>
 
 namespace OpenMM {
@@ -48,7 +48,7 @@ namespace OpenMM {
  * by calling setParticleParameters().
  */
 
-class OPENMM_EXPORT AmoebaGeneralizedKirkwoodForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaGeneralizedKirkwoodForce : public Force {
 
 public:
 

plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/Force.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include <vector>
 
 namespace OpenMM {
@@ -48,7 +48,7 @@ namespace OpenMM {
  * an angle has been added, you can modify its force field parameters by calling setAngleParameters().
  */
 
-class OPENMM_EXPORT AmoebaInPlaneAngleForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaInPlaneAngleForce : public Force {
 
 public:
 

plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h

@@ -34,7 +34,7 @@
 
 #include "openmm/Force.h"
 #include "openmm/OpenMMException.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include "openmm/Vec3.h"
 
 #include <sstream>
@@ -49,7 +49,7 @@ namespace OpenMM {
  * an entry has been added, you can modify its force field parameters by calling setMultipoleParameters().
  */
 
-class OPENMM_EXPORT AmoebaMultipoleForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaMultipoleForce : public Force {
 
 public:
 

plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/Force.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include <vector>
 
 namespace OpenMM {
@@ -45,7 +45,7 @@ namespace OpenMM {
  * an out-of-plane bend has been added, you can modify its force field parameters by calling setOutOfPlaneBendParameters().
  */
 
-class OPENMM_EXPORT AmoebaOutOfPlaneBendForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaOutOfPlaneBendForce : public Force {
 
 public:
 

plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h

@@ -33,7 +33,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "openmm/Force.h"
-#include "openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExportAmoeba.h"
 #include <vector>
 
 namespace OpenMM {
@@ -45,7 +45,7 @@ namespace OpenMM {
  * a torsion has been added, you can modify its force field parameters by calling setPiTorsionParameters().
  */
 
-class OPENMM_EXPORT AmoebaPiTorsionForce : public Force {
+class OPENMM_EXPORT_AMOEBA AmoebaPiTorsionForce : public Force {
 
 public: