From 20e9d73dc8f7822ef228cb7506304d9501872de1 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 24 Mar 2011 00:00:54 +0000 Subject: [PATCH] working on cppunit x64 git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5223 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- All.sln | 11 +- unit/unit.vcproj | 797 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 802 insertions(+), 6 deletions(-) diff --git a/All.sln b/All.sln index b8eb5e6e..dce6a3af 100644 --- a/All.sln +++ b/All.sln @@ -60,13 +60,16 @@ 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}.Debug|x64.Build.0 = Debug|x64 {270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.ActiveCfg = Debug|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|x64.ActiveCfg = Debug|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|x64.ActiveCfg = Release|Win32 + {270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.ActiveCfg = Release|x64 + {270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.Build.0 = 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 {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.ActiveCfg = Debug|Win32 {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.Build.0 = Debug|Win32 @@ -133,16 +136,12 @@ Global {66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 {66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|x64.Build.0 = ReleaseDll|x64 {941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|Win32.ActiveCfg = Debug|Win32 - {941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|Win32.Build.0 = Debug|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.Debug|x64.ActiveCfg = Debug|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|Win32.ActiveCfg = Debug|Win32 - {941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|Win32.Build.0 = Debug|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.DebugDll|x64.ActiveCfg = Debug|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|Win32.ActiveCfg = Release|Win32 - {941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|Win32.Build.0 = Release|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.Release|x64.ActiveCfg = Release|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|Win32.ActiveCfg = Release|Win32 - {941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|Win32.Build.0 = Release|Win32 {941BC4D5-7D05-4786-BC65-38914514EA9B}.ReleaseDll|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/unit/unit.vcproj b/unit/unit.vcproj index 7b4cc784..72ee0e08 100644 --- a/unit/unit.vcproj +++ b/unit/unit.vcproj @@ -107,6 +107,69 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -361,6 +491,14 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + @@ -552,6 +714,14 @@ CompileAs="2" /> + + + + + + @@ -576,6 +754,14 @@ CompileAs="2" /> + + + + + + @@ -600,6 +794,14 @@ CompileAs="2" /> + + + + + + @@ -624,6 +834,14 @@ CompileAs="2" /> + + + + + + + + + + + + @@ -674,6 +918,14 @@ CompileAs="2" /> + + + + + + @@ -698,6 +958,14 @@ CompileAs="2" /> + + + + + + @@ -722,6 +998,14 @@ CompileAs="2" /> + + + + + + @@ -746,6 +1038,14 @@ CompileAs="2" /> + + + + + + @@ -770,6 +1078,14 @@ CompileAs="2" /> + + + + + + @@ -794,6 +1118,14 @@ CompileAs="2" /> + + + + + + @@ -818,6 +1158,14 @@ CompileAs="2" /> + + + + + + @@ -842,6 +1198,14 @@ CompileAs="2" /> + + + + + + @@ -866,6 +1238,14 @@ CompileAs="2" /> + + + + + + + + + + + + @@ -916,6 +1321,14 @@ CompileAs="2" /> + + + + + + @@ -940,6 +1361,14 @@ CompileAs="2" /> + + + + + + @@ -964,6 +1401,14 @@ CompileAs="2" /> + + + + + + @@ -988,6 +1441,14 @@ CompileAs="2" /> + + + + + + @@ -1012,6 +1481,14 @@ CompileAs="2" /> + + + + + + @@ -1036,6 +1521,14 @@ CompileAs="2" /> + + + + + + @@ -1060,6 +1561,14 @@ CompileAs="2" /> + + + + + + @@ -1084,6 +1601,14 @@ CompileAs="2" /> + + + + + + @@ -1108,6 +1641,14 @@ CompileAs="2" /> + + + + + + @@ -1132,6 +1681,14 @@ CompileAs="2" /> + + + + + + @@ -1156,6 +1721,14 @@ CompileAs="2" /> + + + + + + @@ -1180,6 +1761,14 @@ CompileAs="2" /> + + + + + + @@ -1204,6 +1801,14 @@ CompileAs="2" /> + + + + + + @@ -1228,6 +1841,14 @@ CompileAs="2" /> + + + + + + @@ -1252,6 +1881,14 @@ CompileAs="2" /> + + + + + + @@ -1272,6 +1917,14 @@ CompileAs="2" /> + + + + + + @@ -1296,6 +1957,14 @@ CompileAs="2" /> + + + + + + @@ -1320,6 +1997,14 @@ CompileAs="2" /> + + + + + + @@ -1344,6 +2037,14 @@ CompileAs="2" /> + + + + + + @@ -1368,6 +2077,14 @@ CompileAs="2" /> + + + + + + @@ -1392,6 +2117,14 @@ CompileAs="2" /> + + + + + + @@ -1416,6 +2157,14 @@ CompileAs="2" /> + + + + + + @@ -1440,6 +2197,14 @@ CompileAs="2" /> + + + + + + @@ -1464,6 +2237,14 @@ CompileAs="2" /> + + + + + + @@ -1488,6 +2277,14 @@ CompileAs="2" /> + + +