max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gtest' into 'master'

Browse Source 
Reset dllexport; fixed doxygen example tests

See merge request coupled/iphreeqc!19
This commit is contained in:
Charlton, Scott R 2020-09-29 22:09:46 +00:00
commit 6d01aab759
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/examples/Makefile
View File

@ -149,6 +149,19 @@ F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA)
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 IPhreeqc_interface.lo: ../../src/IPhreeqc_interface.F90
$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $< $(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<

6
src/IPhreeqc_interface_F.h
View File

@ -1,11 +1,7 @@
#ifndef __IPHREEQC_INTERFACE__H #ifndef __IPHREEQC_INTERFACE__H
#define __IPHREEQC_INTERFACE__H #define __IPHREEQC_INTERFACE__H
#if defined(_WINDLL) #include "PHRQ_exports.h"
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#ifdef SKIP #ifdef SKIP
#if defined(FC_FUNC) #if defined(FC_FUNC)

9
src/phreeqcpp/common/PHRQ_exports.h
View File

@ -1,12 +1,9 @@
#ifndef INC_PHRQ_EXPORTS_H #ifndef INC_PHRQ_EXPORTS_H
#define INC_PHRQ_EXPORTS_H #define INC_PHRQ_EXPORTS_H
#if defined(_WINDLL)
# ifdef IPhreeqc_EXPORTS #if defined(_WINDLL) && defined(IPhreeqc_EXPORTS)
# define IPQ_DLL_EXPORT __declspec(dllexport) # define IPQ_DLL_EXPORT __declspec(dllexport)
# else
# define IPQ_DLL_EXPORT __declspec(dllimport)
# endif
#else #else
# define IPQ_DLL_EXPORT # define IPQ_DLL_EXPORT
#endif #endif