From f7d7fef7a01f28095105722696b12c3c285ad9bf Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Tue, 29 Sep 2020 10:27:55 -0600
Subject: [PATCH 1/2] reset for dlls

---
 src/IPhreeqc_interface_F.h          | 6 +-----
 src/phreeqcpp/common/PHRQ_exports.h | 9 +++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/IPhreeqc_interface_F.h b/src/IPhreeqc_interface_F.h
index d1c3e2a3..d3fe29ec 100644
--- a/src/IPhreeqc_interface_F.h
+++ b/src/IPhreeqc_interface_F.h
@@ -1,11 +1,7 @@
 #ifndef __IPHREEQC_INTERFACE__H
 #define __IPHREEQC_INTERFACE__H
 
-#if defined(_WINDLL)
-#define IPQ_DLL_EXPORT __declspec(dllexport)
-#else
-#define IPQ_DLL_EXPORT
-#endif
+#include "PHRQ_exports.h"
 
 #ifdef SKIP
 #if defined(FC_FUNC)
diff --git a/src/phreeqcpp/common/PHRQ_exports.h b/src/phreeqcpp/common/PHRQ_exports.h
index d936a60c..8f50a7cc 100644
--- a/src/phreeqcpp/common/PHRQ_exports.h
+++ b/src/phreeqcpp/common/PHRQ_exports.h
@@ -1,12 +1,9 @@
 #ifndef INC_PHRQ_EXPORTS_H
 #define INC_PHRQ_EXPORTS_H
 
-#if defined(_WINDLL)
-#  ifdef IPhreeqc_EXPORTS
-#    define IPQ_DLL_EXPORT __declspec(dllexport)
-#  else
-#    define IPQ_DLL_EXPORT __declspec(dllimport)
-#  endif
+
+#if defined(_WINDLL) && defined(IPhreeqc_EXPORTS)
+#  define IPQ_DLL_EXPORT __declspec(dllexport)
 #else
 #  define IPQ_DLL_EXPORT
 #endif

From 20c11bc17e315ad104b85da327338536810699b6 Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Tue, 29 Sep 2020 16:05:52 -0600
Subject: [PATCH 2/2] IPhreeqc_interface must be compiled first

---
 doc/examples/Makefile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 9032d8f0..3e0509c5 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -148,7 +148,20 @@ F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA)
 	$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<
 
 
-F90CreateIPhreeqc.lo: IPhreeqc_interface.lo 
+F90CreateIPhreeqc.lo: IPhreeqc_interface.lo
+F90ClearAccumulatedLines.lo: IPhreeqc_interface.lo
+F90CreateIPhreeqc.lo: IPhreeqc_interface.lo
+F90DestroyIPhreeqc.lo: IPhreeqc_interface.lo
+F90GetComponent.lo: IPhreeqc_interface.lo
+F90GetDumpStringLine.lo: IPhreeqc_interface.lo
+F90GetErrorStringLine.lo: IPhreeqc_interface.lo
+F90GetLogStringLine.lo: IPhreeqc_interface.lo
+F90GetOutputStringLine.lo: IPhreeqc_interface.lo
+F90GetSelectedOutputStringLine.lo: IPhreeqc_interface.lo
+F90GetSelectedOutputValue.lo: IPhreeqc_interface.lo
+F90GetVersionString.lo: IPhreeqc_interface.lo
+F90SetBasicFortranCallback.lo: IPhreeqc_interface.lo
+
 
 IPhreeqc_interface.lo: ../../src/IPhreeqc_interface.F90
 	$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<