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

added src/phreeqcpp/common/PHRQ_exports.h

Browse Source
This commit is contained in:
Charlton, Scott R 2020-09-15 20:29:41 -06:00
parent 093f8e99ca
commit 3091de68dd
12 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -78,6 +78,7 @@ SET(IPhreeqc_SOURCES
src/phreeqcpp/common/Parser.h
src/phreeqcpp/common/PHRQ_base.cxx
src/phreeqcpp/common/PHRQ_base.h
src/phreeqcpp/common/PHRQ_exports.h
src/phreeqcpp/common/PHRQ_io.cpp
src/phreeqcpp/common/PHRQ_io.h
src/phreeqcpp/common/phrqtype.h
@ -281,6 +282,7 @@ set(IPhreeqc_Headers
${PROJECT_SOURCE_DIR}/src/IPhreeqc.hpp
${PROJECT_SOURCE_DIR}/src/IPhreeqcCallbacks.h
${PROJECT_SOURCE_DIR}/src/phreeqcpp/PhreeqcKeywords/Keywords.h
${PROJECT_SOURCE_DIR}/src/phreeqcpp/common/PHRQ_exports.h
${PROJECT_SOURCE_DIR}/src/phreeqcpp/common/PHRQ_io.h
${PROJECT_SOURCE_DIR}/src/Var.h
)

4
R/Makefile
View File

@ -168,6 +168,7 @@ PSRC = \
$(DEST)/Phreeqc.h \
$(DEST)/PHRQ_base.cpp \
$(DEST)/PHRQ_base.h \
$(DEST)/PHRQ_exports.h \
$(DEST)/PHRQ_io.cpp \
$(DEST)/PHRQ_io.h \
$(DEST)/PHRQ_io_output.cpp \
@ -503,6 +504,9 @@ $(DEST)/PHRQ_base.cpp : $(SRC)/common/PHRQ_base.cxx
$(DEST)/PHRQ_base.h : $(SRC)/common/PHRQ_base.h
$(CP) $< $@
$(DEST)/PHRQ_exports.h : $(SRC)/common/PHRQ_exports.h
$(CP) $< $@
$(DEST)/PHRQ_io.cpp : $(SRC)/common/PHRQ_io.cpp
$(CP) $< $@

6
src/CSelectedOutput.hxx
View File

@ -15,11 +15,7 @@
#include <vector>
#include "CVar.hxx"
#if defined(_WINDLL)
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#include "PHRQ_exports.h"
class IPQ_DLL_EXPORT CSelectedOutput
{

6
src/IPhreeqc.hpp
View File

@ -14,11 +14,7 @@
#include "Var.h" /* VRESULT */
#include "PHRQ_io.h"
#if defined(_WINDLL)
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#include "PHRQ_exports.h"
class Phreeqc;
class IErrorReporter;

1
src/Makefile.am
View File

@ -48,6 +48,7 @@ libiphreeqc_la_SOURCES=\
phreeqcpp/common/Parser.h\
phreeqcpp/common/PHRQ_base.cxx\
phreeqcpp/common/PHRQ_base.h\
phreeqcpp/common/PHRQ_exports.h\
phreeqcpp/common/PHRQ_io.cpp\
phreeqcpp/common/PHRQ_io.h\
phreeqcpp/common/phrqtype.h\

6
src/Var.h
View File

@ -6,11 +6,7 @@
#ifndef __VAR_H_INC
#define __VAR_H_INC
#if defined(_WINDLL)
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#include "PHRQ_exports.h"
#if defined(R_SO) || defined(NO_NAMELESS_UNION)
#define VAR_UNION_NAME u

1
src/phreeqcpp/Makefile.am
View File

@ -24,6 +24,7 @@ phreeqc_SOURCES=\
common/Parser.h\
common/PHRQ_base.cxx\
common/PHRQ_base.h\
common/PHRQ_exports.h\
common/PHRQ_io.cpp\
common/PHRQ_io.h\
common/phrqtype.h\

6
src/phreeqcpp/NameDouble.h
View File

@ -1,11 +1,7 @@
#if !defined(NAMEDOUBLE_H_INCLUDED)
#define NAMEDOUBLE_H_INCLUDED
#if defined(_WINDLL)
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#include "PHRQ_exports.h"
#include <cassert> // assert
#include <map> // std::map

6
src/phreeqcpp/common/PHRQ_base.h
View File

@ -3,11 +3,7 @@
#include <sstream>
#if defined(_WINDLL)
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#include "PHRQ_exports.h"
class PHRQ_io;
class IPQ_DLL_EXPORT PHRQ_base

14
src/phreeqcpp/common/PHRQ_exports.h Normal file
View File

@ -0,0 +1,14 @@
#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
#else
# define IPQ_DLL_EXPORT
#endif
#endif // INC_PHRQ_EXPORTS_H

6
src/phreeqcpp/common/PHRQ_io.h
View File

@ -1,11 +1,7 @@
#ifndef _PHRQIO_H
#define _PHRQIO_H
#if defined(_WINDLL)
#define IPQ_DLL_EXPORT __declspec(dllexport)
#else
#define IPQ_DLL_EXPORT
#endif
#include "PHRQ_exports.h"
#include <iostream>
#include <exception>

1
unit/Makefile.am
View File

@ -59,6 +59,7 @@ unit_SOURCES=\
../src/phreeqcpp/Phreeqc.h\
../src/phreeqcpp/PHRQ_base.cxx\
../src/phreeqcpp/PHRQ_base.h\
../src/phreeqcpp/PHRQ_export.h\
../src/phreeqcpp/PHRQ_io.cpp\
../src/phreeqcpp/PHRQ_io.h\
../src/phreeqcpp/Phreeqc_class.h\