Further modifications for Graphviz dlls for Windows

diff --git a/lib/common/globals.c b/lib/common/globals.c
index 927b3cb61f054bda3626cf0f3606975515e73921..6e4ecd4f06b941bac770b6ef7f5e77cf96331552 100644 (file)
--- a/lib/common/globals.c
+++ b/lib/common/globals.c
@@ -18,6 +18,10 @@
 #include "config.h"
 #endif
 
+#if defined(GVDLL)
+#define _BLD_dotneato 1
+#else
 #define EXTERN
+#endif
 #include "types.h"
 #include "globals.h"

diff --git a/lib/common/globals.h b/lib/common/globals.h
index 78b62d78984edf76fa96c39da59bb4c90691df1a..f2a166f9f13f64d3f9c3869356de8dd5abbf8f63 100644 (file)
--- a/lib/common/globals.h
+++ b/lib/common/globals.h
@@ -38,6 +38,10 @@
 #   define external __IMPORT__
 #endif
 #endif
+#if !_BLD_dotneato && defined(GVDLL)
+#define external       __declspec(dllimport)
+#define EXTERN __declspec(dllimport)
+#endif
 
 #ifndef external
 #   define external   extern
@@ -122,6 +126,7 @@ extern "C" {
     EXTERN fdpParms_t fdp_parms;
 
 #undef external
+#undef EXTERN
 
 #ifdef __cplusplus
 }

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 2b3c9cc9a68eb13f176dd101f6feb20a5ac14945..c83c3f8db52017c9436febd6c543f1a7a2dd2983 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -48,7 +48,12 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
 #              and with the plugins themselves, e.g.
 #  -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_gd -lgvplugin_pangocairo
 libgvc_builtins_la_LDFLAGS = -version-info @VERSION_INFO@
+if WITH_WIN32
+libgvc_builtins_la_SOURCES = $(libgvc_C_la_SOURCES) dot_builtins.c no_demand_loading.c
+else
 libgvc_builtins_la_SOURCES = $(libgvc_C_la_SOURCES)
+endif
+
 libgvc_builtins_la_LIBADD = $(libgvc_la_LIBADD)
 
 .3.pdf: