From 06f0bbe857fe5d34fb6c00a14db550bf84644216 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 18 Feb 2010 12:19:06 +0000 Subject: [PATCH] Fixes for DLL building on Windows. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1738 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/include/PrismNativeGlob.h | 11 +++++++++-- prism/src/prism/PrismNative.cc | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/prism/include/PrismNativeGlob.h b/prism/include/PrismNativeGlob.h index a1629f28..961a6441 100644 --- a/prism/include/PrismNativeGlob.h +++ b/prism/include/PrismNativeGlob.h @@ -26,6 +26,13 @@ #include +// Flags for building Windows DLLs +#ifdef __MINGW32__ + #define EXPORT __declspec(dllexport) +#else + #define EXPORT +#endif + //------------------------------------------------------------------------------ // Constants - these need to match the definitions in prism/Prism.java @@ -39,8 +46,8 @@ const int EXPORT_ADV_MDP = 2; // External refs to global variables // adversary export mode -extern int export_adv; +EXPORT extern int export_adv; // adversary export filename -extern const char *export_adv_filename; +EXPORT extern const char *export_adv_filename; //------------------------------------------------------------------------------ diff --git a/prism/src/prism/PrismNative.cc b/prism/src/prism/PrismNative.cc index abf40a06..a551dbcf 100644 --- a/prism/src/prism/PrismNative.cc +++ b/prism/src/prism/PrismNative.cc @@ -28,12 +28,13 @@ #include #include #include +#include "PrismNativeGlob.h" #include "jnipointer.h" // adversary export mode -int export_adv; +EXPORT int export_adv; // adversary export filename -const char *export_adv_filename; +EXPORT const char *export_adv_filename; //------------------------------------------------------------------------------ // Set methods for options in native code