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 support for dll run time libraries

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4239 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-04-09 04:22:42 +00:00
parent f08645b65b
commit d94c5030a0
15 changed files with 1609 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IPhreeqc.sln
View File

@ -33,52 +33,82 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
DebugDll|Win32 = DebugDll|Win32
MemDebug|Win32 = MemDebug|Win32 MemDebug|Win32 = MemDebug|Win32
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
ReleaseDll|Win32 = ReleaseDll|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Debug|Win32.ActiveCfg = Debug|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Debug|Win32.ActiveCfg = Debug|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Debug|Win32.Build.0 = Debug|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Debug|Win32.Build.0 = Debug|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|Win32.Build.0 = DebugDll|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|Win32.ActiveCfg = MemDebug|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|Win32.Build.0 = MemDebug|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|Win32.Build.0 = MemDebug|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|Win32.ActiveCfg = Release|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|Win32.ActiveCfg = Release|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|Win32.Build.0 = Release|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|Win32.Build.0 = Release|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.ActiveCfg = Debug|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.ActiveCfg = Debug|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.Build.0 = Debug|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.Build.0 = Debug|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.ActiveCfg = Release|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.Build.0 = Release|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|Win32.ActiveCfg = MemDebug|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|Win32.Build.0 = MemDebug|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|Win32.Build.0 = MemDebug|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.ActiveCfg = Release|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.ActiveCfg = Release|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.Build.0 = Release|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.Build.0 = Release|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.ActiveCfg = Release|Win32
{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.Build.0 = Release|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|Win32.ActiveCfg = Debug|Win32 {14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|Win32.ActiveCfg = Debug|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|Win32.Build.0 = Debug|Win32 {14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|Win32.Build.0 = Debug|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.DebugDll|Win32.Build.0 = DebugDll|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 {14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|Win32.ActiveCfg = MemDebug|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|Win32.Build.0 = MemDebug|Win32 {14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|Win32.Build.0 = MemDebug|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|Win32.ActiveCfg = Release|Win32 {14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|Win32.ActiveCfg = Release|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|Win32.Build.0 = Release|Win32 {14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|Win32.Build.0 = Release|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|Win32.ActiveCfg = Debug|Win32 {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|Win32.ActiveCfg = Debug|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|Win32.Build.0 = Debug|Win32 {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|Win32.Build.0 = Debug|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.DebugDll|Win32.Build.0 = DebugDll|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 {0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|Win32.ActiveCfg = MemDebug|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|Win32.Build.0 = MemDebug|Win32 {0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|Win32.Build.0 = MemDebug|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|Win32.ActiveCfg = Release|Win32 {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|Win32.ActiveCfg = Release|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|Win32.Build.0 = Release|Win32 {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|Win32.Build.0 = Release|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|Win32.ActiveCfg = Debug|Win32 {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|Win32.ActiveCfg = Debug|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|Win32.Build.0 = Debug|Win32 {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|Win32.Build.0 = Debug|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.DebugDll|Win32.Build.0 = DebugDll|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|Win32.ActiveCfg = Debug|Win32 {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|Win32.ActiveCfg = Debug|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|Win32.Build.0 = Debug|Win32 {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|Win32.Build.0 = Debug|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|Win32.ActiveCfg = Release|Win32 {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|Win32.ActiveCfg = Release|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|Win32.Build.0 = Release|Win32 {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|Win32.Build.0 = Release|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|Win32.ActiveCfg = Debug|Win32 {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|Win32.ActiveCfg = Debug|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|Win32.Build.0 = Debug|Win32 {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|Win32.Build.0 = Debug|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.DebugDll|Win32.Build.0 = DebugDll|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|Win32.ActiveCfg = Debug|Win32 {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|Win32.ActiveCfg = Debug|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|Win32.Build.0 = Debug|Win32 {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|Win32.Build.0 = Debug|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|Win32.ActiveCfg = Release|Win32 {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|Win32.ActiveCfg = Release|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|Win32.Build.0 = Release|Win32 {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|Win32.Build.0 = Release|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|Win32.ActiveCfg = Debug|Win32 {046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|Win32.ActiveCfg = Debug|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|Win32.Build.0 = Debug|Win32 {046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|Win32.Build.0 = Debug|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.DebugDll|Win32.Build.0 = DebugDll|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|Win32.ActiveCfg = Debug|Win32 {046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|Win32.ActiveCfg = Debug|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|Win32.Build.0 = Debug|Win32 {046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|Win32.Build.0 = Debug|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.Release|Win32.ActiveCfg = Release|Win32 {046110C9-CD5B-404D-B197-E295656CBF7F}.Release|Win32.ActiveCfg = Release|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.Release|Win32.Build.0 = Release|Win32 {046110C9-CD5B-404D-B197-E295656CBF7F}.Release|Win32.Build.0 = Release|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1095
IPhreeqc.vcproj
View File

File diff suppressed because it is too large Load Diff

56
IPhreeqc.vcproj.GS.charlton.user
View File

@ -89,5 +89,61 @@
MPIAcceptFilter="" MPIAcceptFilter=""
/> />
</Configuration> </Configuration>
<Configuration
Name="ReleaseDll|Win32"
>
<DebugSettings
Command=""
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="IGSKAHHWWSNY5H1"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="DebugDll|Win32"
>
<DebugSettings
Command=""
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="IGSKAHHWWSNY5H1"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations> </Configurations>
</VisualStudioUserFile> </VisualStudioUserFile>

84
include/IPhreeqc.h
View File

@ -5,6 +5,12 @@
#include "Var.h" #include "Var.h"
#if defined(_WINDLL)
#define DLL_EXPORT __declspec(dllexport)
#else
#define DLL_EXPORT
#endif
/*! \brief Enumeration used to return error codes. /*! \brief Enumeration used to return error codes.
*/ */
typedef enum { typedef enum {
@ -29,11 +35,11 @@ extern "C" {
* Internally used to create an error condition. * Internally used to create an error condition.
* @internal * @internal
*/ */
int AddError(int id, const char* error_msg); DLL_EXPORT int AddError(int id, const char* error_msg);
int CreateIPhreeqc(void); DLL_EXPORT int CreateIPhreeqc(void);
IPQ_RESULT DestroyIPhreeqc(int id); DLL_EXPORT IPQ_RESULT DestroyIPhreeqc(int id);
/** /**
* Load the specified database file into phreeqc. * Load the specified database file into phreeqc.
@ -55,7 +61,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int LoadDatabase(int id, const char* filename); DLL_EXPORT int LoadDatabase(int id, const char* filename);
/** /**
* Load the specified string as a database into phreeqc. * Load the specified string as a database into phreeqc.
@ -75,14 +81,14 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int LoadDatabaseString(int id, const char* input); DLL_EXPORT int LoadDatabaseString(int id, const char* input);
/** /**
* Unload any database currently loaded into phreeqc. * Unload any database currently loaded into phreeqc.
* @remarks * @remarks
* Any previous database definitions are cleared. * Any previous database definitions are cleared.
*/ */
int UnLoadDatabase(int id); DLL_EXPORT int UnLoadDatabase(int id);
/** /**
* Output the error messages normally stored in the phreeqc.err file to stdout. * Output the error messages normally stored in the phreeqc.err file to stdout.
@ -96,19 +102,19 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
void OutputLastError(int id); DLL_EXPORT void OutputLastError(int id);
void OutputLastWarning(int id); DLL_EXPORT void OutputLastWarning(int id);
const char* GetLastErrorString(int id); DLL_EXPORT const char* GetLastErrorString(int id);
const char* GetLastWarningString(int id); DLL_EXPORT const char* GetLastWarningString(int id);
const char* GetDumpString(int id); DLL_EXPORT const char* GetDumpString(int id);
int GetDumpLineCount(int id); DLL_EXPORT int GetDumpLineCount(int id);
const char* GetDumpLine(int id, int n); DLL_EXPORT const char* GetDumpLine(int id, int n);
/** /**
* Accumlulate lines for input to phreeqc. * Accumlulate lines for input to phreeqc.
@ -127,7 +133,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
IPQ_RESULT AccumulateLine(int id, const char *line); DLL_EXPORT IPQ_RESULT AccumulateLine(int id, const char *line);
/** /**
* Sets the selected_output flag on or off * Sets the selected_output flag on or off
@ -143,8 +149,8 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetSelectedOutputOn(int id); DLL_EXPORT int GetSelectedOutputOn(int id);
IPQ_RESULT SetSelectedOutputOn(int id, int value); DLL_EXPORT IPQ_RESULT SetSelectedOutputOn(int id, int value);
/** /**
* Sets the output flag on or off * Sets the output flag on or off
@ -160,8 +166,8 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetOutputOn(int id); DLL_EXPORT int GetOutputOn(int id);
IPQ_RESULT SetOutputOn(int id, int value); DLL_EXPORT IPQ_RESULT SetOutputOn(int id, int value);
/** /**
* Sets the error flag on or off * Sets the error flag on or off
@ -177,8 +183,8 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetErrorOn(int id); DLL_EXPORT int GetErrorOn(int id);
IPQ_RESULT SetErrorOn(int id, int value); DLL_EXPORT IPQ_RESULT SetErrorOn(int id, int value);
/** /**
* Sets the log flag on or off * Sets the log flag on or off
@ -194,8 +200,8 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetLogOn(int id); DLL_EXPORT int GetLogOn(int id);
IPQ_RESULT SetLogOn(int id, int value); DLL_EXPORT IPQ_RESULT SetLogOn(int id, int value);
/** /**
* Sets the dump flag on or off * Sets the dump flag on or off
@ -211,8 +217,8 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetDumpOn(int id); DLL_EXPORT int GetDumpOn(int id);
IPQ_RESULT SetDumpOn(int id, int value); DLL_EXPORT IPQ_RESULT SetDumpOn(int id, int value);
/** /**
* Sets the dump string flag on or off * Sets the dump string flag on or off
@ -228,8 +234,8 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetDumpStringOn(int id); DLL_EXPORT int GetDumpStringOn(int id);
IPQ_RESULT SetDumpStringOn(int id, int value); DLL_EXPORT IPQ_RESULT SetDumpStringOn(int id, int value);
/** /**
* Runs the accumulated input sent to AccumulateLine. * Runs the accumulated input sent to AccumulateLine.
@ -248,7 +254,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int RunAccumulated(int id); DLL_EXPORT int RunAccumulated(int id);
/** /**
* Runs the specified phreeqc input file. * Runs the specified phreeqc input file.
@ -267,7 +273,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int RunFile(int id, const char* filename); DLL_EXPORT int RunFile(int id, const char* filename);
/** /**
* Runs the specified string as input to phreeqc. * Runs the specified string as input to phreeqc.
@ -286,7 +292,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int RunString(int id, const char* input); DLL_EXPORT int RunString(int id, const char* input);
/** /**
* Returns the number of rows currently contained within selected_output. * Returns the number of rows currently contained within selected_output.
@ -301,7 +307,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetSelectedOutputRowCount(int id); DLL_EXPORT int GetSelectedOutputRowCount(int id);
/** /**
* Returns the number of columns currently contained within selected_output. * Returns the number of columns currently contained within selected_output.
@ -316,7 +322,7 @@ extern "C" {
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetSelectedOutputColumnCount(int id); DLL_EXPORT int GetSelectedOutputColumnCount(int id);
/** /**
* Returns the \c VAR associated with the specified row and column. * Returns the \c VAR associated with the specified row and column.
@ -483,7 +489,7 @@ Headings
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
IPQ_RESULT GetSelectedOutputValue(int id, int row, int col, VAR* pVAR); DLL_EXPORT IPQ_RESULT GetSelectedOutputValue(int id, int row, int col, VAR* pVAR);
/** /**
* TODO * TODO
@ -498,7 +504,7 @@ Headings
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetComponentCount(int id); DLL_EXPORT int GetComponentCount(int id);
/** /**
* TODO * TODO
@ -513,7 +519,7 @@ Headings
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
const char* GetComponent(int id, int n); DLL_EXPORT const char* GetComponent(int id, int n);
/** /**
* Send the accumulated input to stdout. * Send the accumulated input to stdout.
@ -528,7 +534,7 @@ Headings
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
void OutputLines(int id); DLL_EXPORT void OutputLines(int id);
// TODO int RunWithCallback(PFN_PRERUN_CALLBACK pfn_pre, PFN_POSTRUN_CALLBACK pfn_post, void *cookie, int output_on, int error_on, int log_on, int selected_output_on); // TODO int RunWithCallback(PFN_PRERUN_CALLBACK pfn_pre, PFN_POSTRUN_CALLBACK pfn_post, void *cookie, int output_on, int error_on, int log_on, int selected_output_on);
@ -547,7 +553,7 @@ Headings
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetErrorLineCount(int id); DLL_EXPORT int GetErrorLineCount(int id);
/** /**
* TODO * TODO
@ -563,7 +569,7 @@ int GetErrorLineCount(int id);
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
const char* GetErrorLine(int id, int n); DLL_EXPORT const char* GetErrorLine(int id, int n);
/** /**
* TODO * TODO
@ -578,7 +584,7 @@ const char* GetErrorLine(int id, int n);
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int GetWarningLineCount(int id); DLL_EXPORT int GetWarningLineCount(int id);
/** /**
* TODO * TODO
@ -594,7 +600,7 @@ int GetWarningLineCount(int id);
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
const char* GetWarningLine(int id, int n); DLL_EXPORT const char* GetWarningLine(int id, int n);

17
include/IPhreeqc.hpp
View File

@ -8,15 +8,21 @@
#include "IPhreeqcCallbacks.h" /* PFN_PRERUN_CALLBACK, PFN_POSTRUN_CALLBACK, PFN_CATCH_CALLBACK */ #include "IPhreeqcCallbacks.h" /* PFN_PRERUN_CALLBACK, PFN_POSTRUN_CALLBACK, PFN_CATCH_CALLBACK */
#include "Var.h" /* VRESULT */ #include "Var.h" /* VRESULT */
#if defined(_WINDLL)
#define DLL_EXPORT __declspec(dllexport)
#else
#define DLL_EXPORT
#endif
class Phreeqc; class Phreeqc;
class IErrorReporter; class IErrorReporter;
class CSelectedOutput; class CSelectedOutput;
class IPhreeqcStop : std::exception class DLL_EXPORT IPhreeqcStop : std::exception
{ {
}; };
class IPhreeqc class DLL_EXPORT IPhreeqc
{ {
public: public:
IPhreeqc(void); IPhreeqc(void);
@ -134,6 +140,13 @@ private:
friend class TestSelectedOutput; friend class TestSelectedOutput;
#endif #endif
Phreeqc* PhreeqcPtr; Phreeqc* PhreeqcPtr;
private:
// copy ctor not supported
IPhreeqc(const IPhreeqc&);
// operator= not supported
IPhreeqc& operator=(const IPhreeqc&);
}; };
#endif // INC_IPHREEQC_HPP #endif // INC_IPHREEQC_HPP

50
src/fwrap.cpp
View File

@ -360,103 +360,103 @@ extern "C" {
// //
// Intel Fortran compiler 9.1 /iface:cvf // Intel Fortran compiler 9.1 /iface:cvf
// //
int __stdcall CREATEIPHREEQC(void) DLL_EXPORT int __stdcall CREATEIPHREEQC(void)
{ {
return CreateIPhreeqcF(); return CreateIPhreeqcF();
} }
int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len) DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
{ {
return LoadDatabaseF(id, filename, len); return LoadDatabaseF(id, filename, len);
} }
void __stdcall OUTPUTLASTERROR(int *id) DLL_EXPORT void __stdcall OUTPUTLASTERROR(int *id)
{ {
OutputLastErrorF(id); OutputLastErrorF(id);
} }
int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len) DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
{ {
return AccumulateLineF(id, line, len); return AccumulateLineF(id, line, len);
} }
void __stdcall SETSELECTEDOUTPUTON(int *id, int *selected_on) DLL_EXPORT void __stdcall SETSELECTEDOUTPUTON(int *id, int *selected_on)
{ {
SetSelectedOutputOnF(id, selected_on); SetSelectedOutputOnF(id, selected_on);
} }
void __stdcall SETOUTPUTON(int *id, int *output_on) DLL_EXPORT void __stdcall SETOUTPUTON(int *id, int *output_on)
{ {
SetOutputOnF(id, output_on); SetOutputOnF(id, output_on);
} }
void __stdcall SETERRORON(int *id, int *error_on) DLL_EXPORT void __stdcall SETERRORON(int *id, int *error_on)
{ {
SetErrorOnF(id, error_on); SetErrorOnF(id, error_on);
} }
void __stdcall SETLOGON(int *id, int *log_on) DLL_EXPORT void __stdcall SETLOGON(int *id, int *log_on)
{ {
SetLogOnF(id, log_on); SetLogOnF(id, log_on);
} }
void __stdcall SETDUMPON(int *id, int *dump_on) DLL_EXPORT void __stdcall SETDUMPON(int *id, int *dump_on)
{ {
SetDumpOnF(id, dump_on); SetDumpOnF(id, dump_on);
} }
void __stdcall SETDUMPSTRINGON(int *id, int *dump_string_on) DLL_EXPORT void __stdcall SETDUMPSTRINGON(int *id, int *dump_string_on)
{ {
SetDumpStringOnF(id, dump_string_on); SetDumpStringOnF(id, dump_string_on);
} }
int __stdcall GETDUMPLINECOUNT(int *id) DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id)
{ {
return GetDumpLineCountF(id); return GetDumpLineCountF(id);
} }
void __stdcall GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void __stdcall GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
{ {
GetDumpLineF(id, n, line, line_length); GetDumpLineF(id, n, line, line_length);
} }
int __stdcall GETERRORLINECOUNT(int *id) DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id)
{ {
return GetErrorLineCountF(id); return GetErrorLineCountF(id);
} }
void __stdcall GETERRORLINE(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void __stdcall GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
{ {
GetErrorLineF(id, n, line, line_length); GetErrorLineF(id, n, line, line_length);
} }
int __stdcall GETWARNINGLINECOUNT(int *id) DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id)
{ {
return GetWarningLineCountF(id); return GetWarningLineCountF(id);
} }
void __stdcall GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void __stdcall GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
{ {
GetWarningLineF(id, n, line, line_length); GetWarningLineF(id, n, line, line_length);
} }
int __stdcall GETCOMPONENTCOUNT(int *id) DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
{ {
return GetComponentCountF(id); return GetComponentCountF(id);
} }
void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
{ {
GetComponentF(id, n, line, line_length); GetComponentF(id, n, line, line_length);
} }
int __stdcall RUNACCUMULATED(int *id) DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
{ {
return RunAccumulatedF(id); return RunAccumulatedF(id);
} }
int __stdcall RUNFILE(int *id, char *filename, unsigned int len) DLL_EXPORT int __stdcall RUNFILE(int *id, char *filename, unsigned int len)
{ {
return RunFileF(id, filename, len); return RunFileF(id, filename, len);
} }
int __stdcall RUNSTRING(int *id, char *input, unsigned int len) DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len)
{ {
return RunStringF(id, input, len); return RunStringF(id, input, len);
} }
void __stdcall OUTPUTLINES(int *id) DLL_EXPORT void __stdcall OUTPUTLINES(int *id)
{ {
OutputLinesF(id); OutputLinesF(id);
} }
int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id) DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
{ {
return GetSelectedOutputRowCountF(id); return GetSelectedOutputRowCountF(id);
} }
int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id) DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{ {
return GetSelectedOutputColumnCountF(id); return GetSelectedOutputColumnCountF(id);
} }
int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{ {
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
} }

5
src/fwrap.h
View File

@ -1,6 +1,11 @@
#ifndef __FWRAP__H #ifndef __FWRAP__H
#define __FWRAP__H #define __FWRAP__H
#if defined(_WINDLL)
#define DLL_EXPORT __declspec(dllexport)
#else
#define DLL_EXPORT
#endif
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

50
src/fwrap2.cpp
View File

@ -10,103 +10,103 @@ extern "C" {
// //
// Intel Fortran compiler 9.1 /iface:cvf // Intel Fortran compiler 9.1 /iface:cvf
// //
int CREATEIPHREEQC(void) DLL_EXPORT int CREATEIPHREEQC(void)
{ {
return CreateIPhreeqcF(); return CreateIPhreeqcF();
} }
int LOADDATABASE(int *id, char *filename, unsigned int len) DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
{ {
return LoadDatabaseF(id, filename, len); return LoadDatabaseF(id, filename, len);
} }
void OUTPUTLASTERROR(int *id) DLL_EXPORT void OUTPUTLASTERROR(int *id)
{ {
OutputLastErrorF(id); OutputLastErrorF(id);
} }
int ACCUMULATELINE(int *id, char *line, unsigned int len) DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
{ {
return AccumulateLineF(id, line, len); return AccumulateLineF(id, line, len);
} }
void SETSELECTEDOUTPUTON(int *id, int *selected_on) DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on)
{ {
SetSelectedOutputOnF(id, selected_on); SetSelectedOutputOnF(id, selected_on);
} }
void SETOUTPUTON(int *id, int *output_on) DLL_EXPORT void SETOUTPUTON(int *id, int *output_on)
{ {
SetOutputOnF(id, output_on); SetOutputOnF(id, output_on);
} }
void SETERRORON(int *id, int *error_on) DLL_EXPORT void SETERRORON(int *id, int *error_on)
{ {
SetErrorOnF(id, error_on); SetErrorOnF(id, error_on);
} }
void SETLOGON(int *id, int *log_on) DLL_EXPORT void SETLOGON(int *id, int *log_on)
{ {
SetLogOnF(id, log_on); SetLogOnF(id, log_on);
} }
void SETDUMPON(int *id, int *dump_on) DLL_EXPORT void SETDUMPON(int *id, int *dump_on)
{ {
SetDumpOnF(id, dump_on); SetDumpOnF(id, dump_on);
} }
void SETDUMPSTRINGON(int *id, int *dump_string_on) DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on)
{ {
SetDumpStringOnF(id, dump_string_on); SetDumpStringOnF(id, dump_string_on);
} }
int GETDUMPLINECOUNT(int *id) DLL_EXPORT int GETDUMPLINECOUNT(int *id)
{ {
return GetDumpLineCountF(id); return GetDumpLineCountF(id);
} }
void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
{ {
GetDumpLineF(id, n, line, line_length); GetDumpLineF(id, n, line, line_length);
} }
int GETERRORLINECOUNT(int *id) DLL_EXPORT int GETERRORLINECOUNT(int *id)
{ {
return GetErrorLineCountF(id); return GetErrorLineCountF(id);
} }
void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
{ {
GetErrorLineF(id, n, line, line_length); GetErrorLineF(id, n, line, line_length);
} }
int GETWARNINGLINECOUNT(int *id) DLL_EXPORT int GETWARNINGLINECOUNT(int *id)
{ {
return GetWarningLineCountF(id); return GetWarningLineCountF(id);
} }
void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
{ {
GetWarningLineF(id, n, line, line_length); GetWarningLineF(id, n, line, line_length);
} }
int GETCOMPONENTCOUNT(int *id) DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
{ {
return GetComponentCountF(id); return GetComponentCountF(id);
} }
void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
{ {
GetComponentF(id, n, line, line_length); GetComponentF(id, n, line, line_length);
} }
int RUNACCUMULATED(int *id) DLL_EXPORT int RUNACCUMULATED(int *id)
{ {
return RunAccumulatedF(id); return RunAccumulatedF(id);
} }
int RUNFILE(int *id, char *filename, unsigned int len) DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len)
{ {
return RunFileF(id, filename, len); return RunFileF(id, filename, len);
} }
int RUNSTRING(int *id, char *input, unsigned int len) DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
{ {
return RunStringF(id, input, len); return RunStringF(id, input, len);
} }
void OUTPUTLINES(int *id) DLL_EXPORT void OUTPUTLINES(int *id)
{ {
OutputLinesF(id); OutputLinesF(id);
} }
int GETSELECTEDOUTPUTROWCOUNT(int *id) DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
{ {
return GetSelectedOutputRowCountF(id); return GetSelectedOutputRowCountF(id);
} }
int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id) DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{ {
return GetSelectedOutputColumnCountF(id); return GetSelectedOutputColumnCountF(id);
} }
int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) DLL_EXPORT int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{ {
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
} }

50
src/fwrap3.cpp
View File

@ -10,103 +10,103 @@ extern "C" {
// //
// Intel Fortran compiler 9.1 /iface:cref /assume:underscore // Intel Fortran compiler 9.1 /iface:cref /assume:underscore
// //
int createiphreeqc_(void) DLL_EXPORT int createiphreeqc_(void)
{ {
return CreateIPhreeqcF(); return CreateIPhreeqcF();
} }
int loaddatabase_(int *id, char *filename, unsigned int len) DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
{ {
return LoadDatabaseF(id, filename, len); return LoadDatabaseF(id, filename, len);
} }
void outputlasterror_(int *id) DLL_EXPORT void outputlasterror_(int *id)
{ {
OutputLastErrorF(id); OutputLastErrorF(id);
} }
int accumulateline_(int *id, char *line, unsigned int len) DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
{ {
return AccumulateLineF(id, line, len); return AccumulateLineF(id, line, len);
} }
void setselectedoutputon_(int *id, int *selected_on) DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on)
{ {
SetSelectedOutputOnF(id, selected_on); SetSelectedOutputOnF(id, selected_on);
} }
void setoutputon_(int *id, int *output_on) DLL_EXPORT void setoutputon_(int *id, int *output_on)
{ {
SetOutputOnF(id, output_on); SetOutputOnF(id, output_on);
} }
void seterroron_(int *id, int *error_on) DLL_EXPORT void seterroron_(int *id, int *error_on)
{ {
SetErrorOnF(id, error_on); SetErrorOnF(id, error_on);
} }
void setlogon_(int *id, int *log_on) DLL_EXPORT void setlogon_(int *id, int *log_on)
{ {
SetLogOnF(id, log_on); SetLogOnF(id, log_on);
} }
void setdumpon_(int *id, int *dump_on) DLL_EXPORT void setdumpon_(int *id, int *dump_on)
{ {
SetLogOnF(id, dump_on); SetLogOnF(id, dump_on);
} }
void setdumpstringon_(int *id, int *dump_string_on) DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
{ {
SetDumpStringOnF(id, dump_string_on); SetDumpStringOnF(id, dump_string_on);
} }
int getdumplinecount_(int *id) DLL_EXPORT int getdumplinecount_(int *id)
{ {
return GetDumpLineCountF(id); return GetDumpLineCountF(id);
} }
void getdumpline_(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length)
{ {
GetDumpLineF(id, n, line, line_length); GetDumpLineF(id, n, line, line_length);
} }
int geterrorlinecount_(int *id) DLL_EXPORT int geterrorlinecount_(int *id)
{ {
return GetErrorLineCountF(id); return GetErrorLineCountF(id);
} }
void geterrorline_(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length)
{ {
GetErrorLineF(id, n, line, line_length); GetErrorLineF(id, n, line, line_length);
} }
int getwarninglinecount_(int *id) DLL_EXPORT int getwarninglinecount_(int *id)
{ {
return GetWarningLineCountF(id); return GetWarningLineCountF(id);
} }
void getwarningline_(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length)
{ {
GetWarningLineF(id, n, line, line_length); GetWarningLineF(id, n, line, line_length);
} }
int getcomponentcount_(int *id) DLL_EXPORT int getcomponentcount_(int *id)
{ {
return GetComponentCountF(id); return GetComponentCountF(id);
} }
void getcomponent_(int *id, int *n, char* line, unsigned int line_length) DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
{ {
GetComponentF(id, n, line, line_length); GetComponentF(id, n, line, line_length);
} }
int runaccumulated_(int *id) DLL_EXPORT int runaccumulated_(int *id)
{ {
return RunAccumulatedF(id); return RunAccumulatedF(id);
} }
int runfile_(int *id, char *filename, unsigned int len) DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len)
{ {
return RunFileF(id, filename, len); return RunFileF(id, filename, len);
} }
int runstring_(int *id, char *input, unsigned int len) DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
{ {
return RunStringF(id, input, len); return RunStringF(id, input, len);
} }
void outputlines_(int *id) DLL_EXPORT void outputlines_(int *id)
{ {
OutputLinesF(id); OutputLinesF(id);
} }
int getselectedoutputrowcount_(int *id) DLL_EXPORT int getselectedoutputrowcount_(int *id)
{ {
return GetSelectedOutputRowCountF(id); return GetSelectedOutputRowCountF(id);
} }
int getselectedoutputcolumncount_(int *id) DLL_EXPORT int getselectedoutputcolumncount_(int *id)
{ {
return GetSelectedOutputColumnCountF(id); return GetSelectedOutputColumnCountF(id);
} }
int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{ {
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
} }

26
test/test.vfproj
View File

@ -21,7 +21,8 @@
<Tool Name="VFCustomBuildTool"/> <Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/> <Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/> <Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/></Configuration> <Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="MemDebug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)"> <Configuration Name="MemDebug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" WarnArgMismatch="true"/> <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" WarnArgMismatch="true"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcmd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/> <Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcmd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
@ -30,7 +31,28 @@
<Tool Name="VFCustomBuildTool"/> <Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/> <Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/> <Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/></Configuration></Configurations> <Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="ReleaseDll|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcDll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test.tlb"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="DebugDll|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" WarnArgMismatch="true"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcDlld.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test.tlb"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files> <Files>
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd">
<File RelativePath="..\include\IPhreeqc.f90.inc"/></Filter> <File RelativePath="..\include\IPhreeqc.f90.inc"/></Filter>

29
test2/test2.vfproj
View File

@ -11,7 +11,8 @@
<Tool Name="VFCustomBuildTool"/> <Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/> <Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/> <Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/></Configuration> <Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)"> <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/"/> <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test2.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" ProgramDatabaseFile="$(OUTDIR)/test2.pdb" SubSystem="subSystemConsole" AdditionalDependencies="iphreeqc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/> <Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test2.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" ProgramDatabaseFile="$(OUTDIR)/test2.pdb" SubSystem="subSystemConsole" AdditionalDependencies="iphreeqc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
@ -20,7 +21,8 @@
<Tool Name="VFCustomBuildTool"/> <Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/> <Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/> <Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/></Configuration> <Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="MemDebug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)"> <Configuration Name="MemDebug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" WarnArgMismatch="true"/> <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" WarnArgMismatch="true"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test2.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test2.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcmd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/> <Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test2.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test2.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcmd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
@ -29,7 +31,28 @@
<Tool Name="VFCustomBuildTool"/> <Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/> <Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/> <Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/></Configuration></Configurations> <Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="ReleaseDll|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test2.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" ProgramDatabaseFile="$(OUTDIR)/test2.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcDll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test2.tlb"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="DebugDll|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" WarnArgMismatch="true"/>
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test2.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test2.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcDlld.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test2.tlb"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files> <Files>
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>
<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>

27
testcpp/testcpp.cpp
View File

@ -1,10 +1,37 @@
#include <iostream> #include <iostream>
#include <cassert>
#include <IPhreeqc.hpp> #include <IPhreeqc.hpp>
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
IPhreeqc obj; IPhreeqc obj;
assert(obj.GetOutputOn() == false);
obj.SetOutputOn(true); obj.SetOutputOn(true);
assert(obj.GetOutputOn() == true);
assert(obj.GetErrorOn() == false);
obj.SetErrorOn(true);
assert(obj.GetErrorOn() == true);
assert(obj.GetSelectedOutputOn() == false);
obj.SetSelectedOutputOn(true);
assert(obj.GetSelectedOutputOn() == true);
assert(obj.GetDumpOn() == false);
obj.SetDumpOn(true);
assert(obj.GetDumpOn() == true);
assert(obj.GetDumpStringOn() == false);
obj.SetDumpStringOn(true);
assert(obj.GetDumpStringOn() == true);
assert(obj.GetLogOn() == false);
obj.SetLogOn(true);
assert(obj.GetLogOn() == true);
if (obj.LoadDatabase("phreeqc.dat")) if (obj.LoadDatabase("phreeqc.dat"))
{ {
goto error; goto error;

161
testcpp/testcpp.vcproj
View File

@ -17,7 +17,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
@ -95,7 +95,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
@ -172,6 +172,163 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="ReleaseDll|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="IPhreeqcDll.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="../lib"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="DebugDll|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="IPhreeqcDlld.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="../lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>

56
testcpp/testcpp.vcproj.GS.charlton.user
View File

@ -61,5 +61,61 @@
MPIAcceptFilter="" MPIAcceptFilter=""
/> />
</Configuration> </Configuration>
<Configuration
Name="ReleaseDll|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="IGSKAHHWWSNY5H1"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="DebugDll|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="IGSKAHHWWSNY5H1"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations> </Configurations>
</VisualStudioUserFile> </VisualStudioUserFile>

6
unit/unit.vcproj
View File

@ -16,7 +16,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ProjectDir)$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@ -106,7 +106,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(ProjectDir)$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@ -195,7 +195,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MemDebug|Win32" Name="MemDebug|Win32"
OutputDirectory="$(ProjectDir)$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"