mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-13 07:08:23 +01:00
All tests compile in all configurations
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
34ddf3b190
commit
955c24ddbe
144
IPhreeqc.sln
144
IPhreeqc.sln
@ -5,27 +5,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IPhreeqc", "IPhreeqc.vcproj
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit", "unit\unit.vcproj", "{270BB952-FCB2-4FA8-821E-BB750E83C902}"
|
||||
EndProject
|
||||
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test", "test\test.vfproj", "{14BB3A4C-1ADE-4212-8931-6514BF913874}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_c", "tests\test_c.vcproj", "{6F2B675D-2585-4AD6-866D-4DDA00279B00}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test2", "test2\test2.vfproj", "{0BF09B12-56BE-42FC-B39E-61AE515D8858}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cxx", "tests\test_cxx.vcproj", "{3102214A-D304-48FC-B2DF-94D838DC4B2A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testf90", "testf90\testf90.vfproj", "{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_getline", "test_getline\test_getline.vfproj", "{D95AB257-163E-4ABD-8577-94FB8D1EF62C}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcpp", "testcpp\testcpp.vcproj", "{046110C9-CD5B-404D-B197-E295656CBF7F}"
|
||||
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_f90", "tests\test_f90.vfproj", "{003309EE-36BE-493B-87D4-FE68918DA9AF}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}
|
||||
EndProjectSection
|
||||
@ -36,8 +26,6 @@ Global
|
||||
Debug|x64 = Debug|x64
|
||||
DebugDll|Win32 = DebugDll|Win32
|
||||
DebugDll|x64 = DebugDll|x64
|
||||
MemDebug|Win32 = MemDebug|Win32
|
||||
MemDebug|x64 = MemDebug|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
ReleaseDll|Win32 = ReleaseDll|Win32
|
||||
@ -52,10 +40,6 @@ Global
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|Win32.Build.0 = DebugDll|Win32
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|x64.ActiveCfg = DebugDll|x64
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|x64.Build.0 = DebugDll|x64
|
||||
{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|x64.ActiveCfg = MemDebug|x64
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|x64.Build.0 = MemDebug|x64
|
||||
{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|x64.ActiveCfg = Release|x64
|
||||
@ -66,94 +50,52 @@ Global
|
||||
{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
|
||||
{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|x64.ActiveCfg = Debug|Win32
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{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}.DebugDll|x64.ActiveCfg = Debug|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|x64.ActiveCfg = MemDebug|Win32
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|x64.ActiveCfg = Debug|x64
|
||||
{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|x64.ActiveCfg = Release|Win32
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.ActiveCfg = Release|x64
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.ActiveCfg = Release|Win32
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.Build.0 = Release|Win32
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|x64.ActiveCfg = Release|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|x64.ActiveCfg = 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}.DebugDll|x64.ActiveCfg = DebugDll|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|x64.ActiveCfg = MemDebug|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|x64.ActiveCfg = Release|Win32
|
||||
{14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|x64.ActiveCfg = ReleaseDll|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|x64.ActiveCfg = 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}.DebugDll|x64.ActiveCfg = DebugDll|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|x64.ActiveCfg = MemDebug|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|x64.ActiveCfg = Release|Win32
|
||||
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|x64.ActiveCfg = ReleaseDll|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|x64.ActiveCfg = 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}.DebugDll|x64.ActiveCfg = DebugDll|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|x64.ActiveCfg = Debug|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|x64.ActiveCfg = Release|Win32
|
||||
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|x64.ActiveCfg = ReleaseDll|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|x64.ActiveCfg = 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}.DebugDll|x64.ActiveCfg = DebugDll|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|x64.ActiveCfg = Debug|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|x64.ActiveCfg = Release|Win32
|
||||
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|x64.ActiveCfg = ReleaseDll|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|x64.ActiveCfg = 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}.DebugDll|x64.ActiveCfg = DebugDll|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|x64.ActiveCfg = Debug|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|x64.ActiveCfg = Release|Win32
|
||||
{046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|x64.ActiveCfg = ReleaseDll|Win32
|
||||
{270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|x64.ActiveCfg = Release|x64
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|Win32.Build.0 = DebugDll|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|x64.ActiveCfg = Debug|x64
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|Win32.Build.0 = Release|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|x64.ActiveCfg = Release|x64
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|x64.ActiveCfg = Release|x64
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|Win32.Build.0 = DebugDll|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|x64.ActiveCfg = Debug|x64
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|Win32.Build.0 = Release|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|x64.ActiveCfg = Release|x64
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|x64.ActiveCfg = Release|x64
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|Win32.Build.0 = DebugDll|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|x64.ActiveCfg = Debug|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|Win32.Build.0 = Release|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|x64.ActiveCfg = Release|x64
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
||||
{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|x64.ActiveCfg = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
3394
IPhreeqc.vcproj
3394
IPhreeqc.vcproj
File diff suppressed because it is too large
Load Diff
@ -117,62 +117,6 @@
|
||||
MPIAcceptFilter=""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="MemDebug|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="MemDebug|x64"
|
||||
>
|
||||
<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="ReleaseDll|Win32"
|
||||
>
|
||||
|
||||
@ -45,7 +45,6 @@ C
|
||||
INTEGER(KIND=4) AccumulateLine
|
||||
INTEGER(KIND=4) CreateIPhreeqc
|
||||
INTEGER(KIND=4) DestroyIPhreeqc
|
||||
INTEGER(KIND=4) GetComponent
|
||||
INTEGER(KIND=4) GetComponentCount
|
||||
INTEGER(KIND=4) GetDumpLine
|
||||
INTEGER(KIND=4) GetDumpLineCount
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
INTERFACE
|
||||
FUNCTION GetDumpStringOn(ID)
|
||||
INTEGER(KIND=4), INTENT(IN) :: ID
|
||||
LOGICAL(KIND=4) :: GetDumpOn
|
||||
LOGICAL(KIND=4) :: GetDumpStringOn
|
||||
END FUNCTION GetDumpStringOn
|
||||
END INTERFACE
|
||||
|
||||
|
||||
@ -154,7 +154,7 @@ GetComponentCount(int id)
|
||||
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
|
||||
if (IPhreeqcPtr)
|
||||
{
|
||||
return IPhreeqcPtr->ListComponents().size();
|
||||
return (int)IPhreeqcPtr->ListComponents().size();
|
||||
}
|
||||
return IPQ_BADINSTANCE;
|
||||
}
|
||||
|
||||
@ -344,7 +344,7 @@ UnLoadDatabaseF(int *id)
|
||||
}
|
||||
|
||||
|
||||
#if defined(_WIN32)
|
||||
#if defined(_WIN32) && !defined(_M_AMD64)
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
@ -353,15 +353,15 @@ extern "C" {
|
||||
//
|
||||
// Intel Fortran compiler 9.1 /iface:cvf
|
||||
//
|
||||
DLL_EXPORT 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);
|
||||
}
|
||||
DLL_EXPORT int __stdcall CREATEIPHREEQC(void)
|
||||
DLL_EXPORT int __stdcall CREATEIPHREEQC(void)
|
||||
{
|
||||
return CreateIPhreeqcF();
|
||||
}
|
||||
DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id)
|
||||
DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id)
|
||||
{
|
||||
return DestroyIPhreeqcF(id);
|
||||
}
|
||||
@ -369,7 +369,7 @@ DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int
|
||||
{
|
||||
GetComponentF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
@ -377,35 +377,51 @@ DLL_EXPORT void __stdcall GETDUMPLINE(int *id, int *n, char* line, unsigned int
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETDUMPON(int *id)
|
||||
{
|
||||
return GetDumpOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETDUMPSTRINGON(int *id)
|
||||
{
|
||||
return GetDumpStringOnF(id);
|
||||
}
|
||||
DLL_EXPORT void __stdcall GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETLOGON(int *id)
|
||||
DLL_EXPORT int __stdcall GETERRORON(int *id)
|
||||
{
|
||||
return GetLogonF(id);
|
||||
return GetErrorOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETOUTPUTON(int *id)
|
||||
DLL_EXPORT int __stdcall GETLOGON(int *id)
|
||||
{
|
||||
return GetOutputF(id);
|
||||
return GetLogOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETOUTPUTON(int *id)
|
||||
{
|
||||
return GetOutputOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTON(int *id)
|
||||
{
|
||||
return GetSelectedOutputOnF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputRowCountF(id);
|
||||
}
|
||||
DLL_EXPORT 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);
|
||||
}
|
||||
@ -413,15 +429,15 @@ DLL_EXPORT void __stdcall GETWARNINGLINE(int *id, int *n, char* line, unsigned i
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id)
|
||||
DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT 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);
|
||||
}
|
||||
DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
|
||||
DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseStringF(id, input, len);
|
||||
}
|
||||
@ -437,15 +453,15 @@ DLL_EXPORT void __stdcall OUTPUTWARNING(int *id)
|
||||
{
|
||||
OutputWarningF(id);
|
||||
}
|
||||
DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
|
||||
DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
|
||||
{
|
||||
return RunAccumulatedF(id);
|
||||
}
|
||||
DLL_EXPORT 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);
|
||||
}
|
||||
DLL_EXPORT 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);
|
||||
}
|
||||
@ -473,7 +489,7 @@ DLL_EXPORT void __stdcall SETSELECTEDOUTPUTON(int *id, int *selected_on)
|
||||
{
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
}
|
||||
DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
|
||||
DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
|
||||
{
|
||||
return UnLoadDatabaseF(id);
|
||||
}
|
||||
|
||||
@ -56,11 +56,11 @@ extern "C" {
|
||||
void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetDumpLineCountF(int *id);
|
||||
void GetDumpLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetDumpOnF(int *id);
|
||||
int GetDumpStringOnF(int *id);
|
||||
int GetErrorLineCountF(int *id);
|
||||
void GetErrorLineF(int *id, int* n, char* line, unsigned int line_length);
|
||||
int GetErrorOnF(int *id);
|
||||
int GetDumpOnF(int *id);
|
||||
int GetDumpStringOnF(int *id);
|
||||
int GetLogOnF(int *id);
|
||||
int GetOutputOnF(int *id);
|
||||
int GetSelectedOutputColumnCountF(int *id);
|
||||
|
||||
169
src/fwrap2.cpp
169
src/fwrap2.cpp
@ -3,6 +3,7 @@
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
@ -10,53 +11,117 @@ extern "C" {
|
||||
//
|
||||
// Intel Fortran compiler 9.1 /iface:cvf
|
||||
//
|
||||
DLL_EXPORT int CREATEIPHREEQC(void)
|
||||
DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
|
||||
{
|
||||
return AccumulateLineF(id, line, len);
|
||||
}
|
||||
DLL_EXPORT int CREATEIPHREEQC(void)
|
||||
{
|
||||
return CreateIPhreeqcF();
|
||||
}
|
||||
DLL_EXPORT int DESTROYIPHREEQC(int *id)
|
||||
DLL_EXPORT int DESTROYIPHREEQC(int *id)
|
||||
{
|
||||
return DestroyIPhreeqcF(id);
|
||||
}
|
||||
DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
|
||||
DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetComponentF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPLINECOUNT(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPON(int *id)
|
||||
{
|
||||
return GetDumpOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPSTRINGON(int *id)
|
||||
{
|
||||
return GetDumpStringOnF(id);
|
||||
}
|
||||
DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETERRORLINECOUNT(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETERRORON(int *id)
|
||||
{
|
||||
return GetErrorOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETLOGON(int *id)
|
||||
{
|
||||
return GetLogOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETOUTPUTON(int *id)
|
||||
{
|
||||
return GetOutputOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTON(int *id)
|
||||
{
|
||||
return GetSelectedOutputOnF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputRowCountF(id);
|
||||
}
|
||||
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);
|
||||
}
|
||||
DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETWARNINGLINECOUNT(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseF(id, filename, len);
|
||||
}
|
||||
DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
|
||||
DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT int UNLOADDATABASE(int *id)
|
||||
{
|
||||
return UnLoadDatabaseF(id);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTERROR(int *id)
|
||||
{
|
||||
OutputErrorF(id);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTLINES(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTWARNING(int *id)
|
||||
{
|
||||
OutputWarningF(id);
|
||||
}
|
||||
DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
|
||||
DLL_EXPORT int RUNACCUMULATED(int *id)
|
||||
{
|
||||
return AccumulateLineF(id, line, len);
|
||||
return RunAccumulatedF(id);
|
||||
}
|
||||
DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on)
|
||||
DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
return RunFileF(id, filename, len);
|
||||
}
|
||||
DLL_EXPORT void SETOUTPUTON(int *id, int *output_on)
|
||||
DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
SetOutputOnF(id, output_on);
|
||||
}
|
||||
DLL_EXPORT void SETERRORON(int *id, int *error_on)
|
||||
{
|
||||
SetErrorOnF(id, error_on);
|
||||
}
|
||||
DLL_EXPORT void SETLOGON(int *id, int *log_on)
|
||||
{
|
||||
SetLogOnF(id, log_on);
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void SETDUMPON(int *id, int *dump_on)
|
||||
{
|
||||
@ -66,65 +131,25 @@ DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on)
|
||||
{
|
||||
SetDumpStringOnF(id, dump_string_on);
|
||||
}
|
||||
DLL_EXPORT int GETDUMPLINECOUNT(int *id)
|
||||
DLL_EXPORT void SETERRORON(int *id, int *error_on)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
SetErrorOnF(id, error_on);
|
||||
}
|
||||
DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void SETLOGON(int *id, int *log_on)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
SetLogOnF(id, log_on);
|
||||
}
|
||||
DLL_EXPORT int GETERRORLINECOUNT(int *id)
|
||||
DLL_EXPORT void SETOUTPUTON(int *id, int *output_on)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
SetOutputOnF(id, output_on);
|
||||
}
|
||||
DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
}
|
||||
DLL_EXPORT int GETWARNINGLINECOUNT(int *id)
|
||||
DLL_EXPORT int UNLOADDATABASE(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetComponentF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int RUNACCUMULATED(int *id)
|
||||
{
|
||||
return RunAccumulatedF(id);
|
||||
}
|
||||
DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
return RunFileF(id, filename, len);
|
||||
}
|
||||
DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void OUTPUTLINES(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputRowCountF(id);
|
||||
}
|
||||
DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
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 UnLoadDatabaseF(id);
|
||||
}
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
||||
176
src/fwrap3.cpp
176
src/fwrap3.cpp
@ -10,45 +10,125 @@ extern "C" {
|
||||
//
|
||||
// Intel Fortran compiler 9.1 /iface:cref /assume:underscore
|
||||
//
|
||||
DLL_EXPORT int createiphreeqc_(void)
|
||||
DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
|
||||
{
|
||||
return AccumulateLineF(id, line, len);
|
||||
}
|
||||
DLL_EXPORT int createiphreeqc_(void)
|
||||
{
|
||||
return CreateIPhreeqcF();
|
||||
}
|
||||
DLL_EXPORT int destroyiphreeqc_(int *id)
|
||||
DLL_EXPORT int destroyiphreeqc_(int *id)
|
||||
{
|
||||
return DestroyIPhreeqcF(id);
|
||||
}
|
||||
DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
|
||||
DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetComponentF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getcomponentcount_(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getdumplinecount_(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int getdumpon_(int *id)
|
||||
{
|
||||
return GetDumpOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getdumpstringon_(int *id)
|
||||
{
|
||||
return GetDumpStringOnF(id);
|
||||
}
|
||||
DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int geterrorlinecount_(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int geterroron_(int *id)
|
||||
{
|
||||
return GetErrorOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getlogon_(int *id)
|
||||
{
|
||||
return GetLogOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getoutputon_(int *id)
|
||||
{
|
||||
return GetOutputOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputcolumncount_(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputon_(int *id)
|
||||
{
|
||||
return GetSelectedOutputOnF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputrowcount_(int *id)
|
||||
{
|
||||
return GetSelectedOutputRowCountF(id);
|
||||
}
|
||||
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);
|
||||
}
|
||||
DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getwarninglinecount_(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseF(id, filename, len);
|
||||
}
|
||||
DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
|
||||
DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return LoadDatabaseStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT int unloaddatabase_(int *id)
|
||||
{
|
||||
return UnLoadDatabaseF(id);
|
||||
}
|
||||
DLL_EXPORT void outputerror_(int *id)
|
||||
{
|
||||
OutputErrorF(id);
|
||||
}
|
||||
DLL_EXPORT void outputlines_(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
}
|
||||
DLL_EXPORT void outputwarning_(int *id)
|
||||
{
|
||||
OutputWarningF(id);
|
||||
}
|
||||
DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
|
||||
DLL_EXPORT int runaccumulated_(int *id)
|
||||
{
|
||||
return AccumulateLineF(id, line, len);
|
||||
return RunAccumulatedF(id);
|
||||
}
|
||||
DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on)
|
||||
DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
return RunFileF(id, filename, len);
|
||||
}
|
||||
DLL_EXPORT void setoutputon_(int *id, int *output_on)
|
||||
DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
|
||||
{
|
||||
SetOutputOnF(id, output_on);
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void setdumpon_(int *id, int *dump_on)
|
||||
{
|
||||
SetDumpOnF(id, dump_on);
|
||||
}
|
||||
DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
|
||||
{
|
||||
SetDumpStringOnF(id, dump_string_on);
|
||||
}
|
||||
DLL_EXPORT void seterroron_(int *id, int *error_on)
|
||||
{
|
||||
@ -58,73 +138,17 @@ DLL_EXPORT void setlogon_(int *id, int *log_on)
|
||||
{
|
||||
SetLogOnF(id, log_on);
|
||||
}
|
||||
DLL_EXPORT void setdumpon_(int *id, int *dump_on)
|
||||
DLL_EXPORT void setoutputon_(int *id, int *output_on)
|
||||
{
|
||||
SetLogOnF(id, dump_on);
|
||||
SetOutputOnF(id, output_on);
|
||||
}
|
||||
DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
|
||||
DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on)
|
||||
{
|
||||
SetDumpStringOnF(id, dump_string_on);
|
||||
SetSelectedOutputOnF(id, selected_on);
|
||||
}
|
||||
DLL_EXPORT int getdumplinecount_(int *id)
|
||||
DLL_EXPORT int unloaddatabase_(int *id)
|
||||
{
|
||||
return GetDumpLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetDumpLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int geterrorlinecount_(int *id)
|
||||
{
|
||||
return GetErrorLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetErrorLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getwarninglinecount_(int *id)
|
||||
{
|
||||
return GetWarningLineCountF(id);
|
||||
}
|
||||
DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetWarningLineF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int getcomponentcount_(int *id)
|
||||
{
|
||||
return GetComponentCountF(id);
|
||||
}
|
||||
DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
|
||||
{
|
||||
GetComponentF(id, n, line, line_length);
|
||||
}
|
||||
DLL_EXPORT int runaccumulated_(int *id)
|
||||
{
|
||||
return RunAccumulatedF(id);
|
||||
}
|
||||
DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len)
|
||||
{
|
||||
return RunFileF(id, filename, len);
|
||||
}
|
||||
DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
|
||||
{
|
||||
return RunStringF(id, input, len);
|
||||
}
|
||||
DLL_EXPORT void outputlines_(int *id)
|
||||
{
|
||||
OutputLinesF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputrowcount_(int *id)
|
||||
{
|
||||
return GetSelectedOutputRowCountF(id);
|
||||
}
|
||||
DLL_EXPORT int getselectedoutputcolumncount_(int *id)
|
||||
{
|
||||
return GetSelectedOutputColumnCountF(id);
|
||||
}
|
||||
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 UnLoadDatabaseF(id);
|
||||
}
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
||||
@ -23,16 +23,6 @@
|
||||
<Tool Name="VFPreBuildEventTool"/>
|
||||
<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)">
|
||||
<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="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>
|
||||
<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"/>
|
||||
|
||||
@ -23,16 +23,6 @@
|
||||
<Tool Name="VFPreBuildEventTool"/>
|
||||
<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)">
|
||||
<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="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>
|
||||
<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"/>
|
||||
|
||||
673
unit/unit.vcproj
673
unit/unit.vcproj
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user