dasher r3501 - in trunk/Src: DasherCore DasherCore/Alphabet Win32



Author: keithv
Date: Wed Apr 16 18:46:20 2008
New Revision: 3501
URL: http://svn.gnome.org/viewvc/dasher?rev=3501&view=rev

Log:
Fixed windows build problems

Modified:
   trunk/Src/DasherCore/Alphabet/AlphIO.h
   trunk/Src/DasherCore/ColourIO.h
   trunk/Src/DasherCore/ControlManager.h
   trunk/Src/DasherCore/DasherCore_vc80.vcproj
   trunk/Src/Win32/DasherControl_vc80.vcproj
   trunk/Src/Win32/Dasher_vc80.sln
   trunk/Src/Win32/Dasher_vc80.vcproj

Modified: trunk/Src/DasherCore/Alphabet/AlphIO.h
==============================================================================
--- trunk/Src/DasherCore/Alphabet/AlphIO.h	(original)
+++ trunk/Src/DasherCore/Alphabet/AlphIO.h	Wed Apr 16 18:46:20 2008
@@ -25,21 +25,13 @@
 //#include "Alphabet.h"
 #include "GroupInfo.h"
 
-//#ifdef _WIN32
-//#include "../../Common/Expat/lib/expat.h"
-//#else
 #include <expat.h>
-//#endif
-
 #include <string>
 #include <map>
 #include <vector>
 #include <utility>              // for std::pair
 #include <stdio.h>              // for C style file IO
 
-
-//#include "../../Common/Expat/lib/expat.h"
-
 namespace Dasher {
   class CAlphIO;
 } 

Modified: trunk/Src/DasherCore/ColourIO.h
==============================================================================
--- trunk/Src/DasherCore/ColourIO.h	(original)
+++ trunk/Src/DasherCore/ColourIO.h	Wed Apr 16 18:46:20 2008
@@ -11,12 +11,7 @@
 
 #include "DasherTypes.h"
 
-//#ifdef _WIN32
-//#include "../Common/Expat/lib/expat.h"
-//#else
 #include <expat.h>
-//#endif
-
 #include <string>
 #include <map>
 #include <vector>

Modified: trunk/Src/DasherCore/ControlManager.h
==============================================================================
--- trunk/Src/DasherCore/ControlManager.h	(original)
+++ trunk/Src/DasherCore/ControlManager.h	Wed Apr 16 18:46:20 2008
@@ -38,22 +38,8 @@
 
 #include <string>
 
-//#ifdef _WIN32
-//#include "../Common/Expat/lib/expat.h"
-//#else
 #include <expat.h>
-//#endif
 
-/* /// \cond expat */
-
-/* // TODO: Make build with internal expat conditional */
-/* namespace expat { */
-/* #include "../Common/Expat/lib/expat.h" */
-/* } */
-
-/* /// \endcond */
-
-//using namespace expat;
 using namespace std;
 
 namespace Dasher {

Modified: trunk/Src/DasherCore/DasherCore_vc80.vcproj
==============================================================================
--- trunk/Src/DasherCore/DasherCore_vc80.vcproj	(original)
+++ trunk/Src/DasherCore/DasherCore_vc80.vcproj	Wed Apr 16 18:46:20 2008
@@ -50,7 +50,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -275,7 +275,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -686,7 +686,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_WIN32_WCE; ARM;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
 				RuntimeLibrary="1"
 				TreatWChar_tAsBuiltInType="false"
@@ -770,7 +770,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_STATIC;_LIB;_UNICODE;_WIN32_WCE=0x501;_ARM_;WINCE;UNDER_CE"
 				RuntimeLibrary="1"
 				TreatWChar_tAsBuiltInType="false"

Modified: trunk/Src/Win32/DasherControl_vc80.vcproj
==============================================================================
--- trunk/Src/Win32/DasherControl_vc80.vcproj	(original)
+++ trunk/Src/Win32/DasherControl_vc80.vcproj	Wed Apr 16 18:46:20 2008
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -186,7 +186,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -258,7 +258,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500WIN32;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -407,7 +407,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -481,7 +481,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -548,7 +548,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -621,7 +621,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WCE=0x501;_ARM_;WINCE;UNDER_CE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -694,7 +694,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500WIN32;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -765,7 +765,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -843,7 +843,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32\Common&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\dasher\dasher\Src\Win32&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;Common&quot;;&quot;.&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: trunk/Src/Win32/Dasher_vc80.sln
==============================================================================
--- trunk/Src/Win32/Dasher_vc80.sln	(original)
+++ trunk/Src/Win32/Dasher_vc80.sln	Wed Apr 16 18:46:20 2008
@@ -1,14 +1,26 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4333F263-1911-4128-A577-2BE0B970B0CA}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(SolutionItems) = preProject
 		..\..\ChangeLog = ..\..\ChangeLog
 		..\..\Doc\development\GUIDS.txt = ..\..\Doc\development\GUIDS.txt
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\Common_vc80.vcproj", "{4A4CEB83-FBC8-4E93-831E-009875E54794}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dasher", "Dasher_vc80.vcproj", "{752501D3-5B04-4F3C-A141-DE426E354D23}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8} = {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD} = {3998D966-9B9E-4214-ACEA-B777985AF4DD}
@@ -16,32 +28,53 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherControl", "DasherControl_vc80.vcproj", "{3998D966-9B9E-4214-ACEA-B777985AF4DD}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8} = {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}
 		{4A4CEB83-FBC8-4E93-831E-009875E54794} = {4A4CEB83-FBC8-4E93-831E-009875E54794}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherCore", "..\DasherCore\DasherCore_vc80.vcproj", "{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{4A4CEB83-FBC8-4E93-831E-009875E54794} = {4A4CEB83-FBC8-4E93-831E-009875E54794}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Expat", "..\Common\Expat\Expat_vc80.vcproj", "{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}"
-EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "..\Installer\Installer.wixproj", "{BBE9E817-E2C5-4081-9612-0738E27CF55A}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DasherIM", "..\DasherIM\DasherIM.vcproj", "{3A5A00A0-DEAB-46D5-9926-3BD370C460F7}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8} = {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05} = {0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD} = {3998D966-9B9E-4214-ACEA-B777985AF4DD}
 		{4A4CEB83-FBC8-4E93-831E-009875E54794} = {4A4CEB83-FBC8-4E93-831E-009875E54794}
 		{752501D3-5B04-4F3C-A141-DE426E354D23} = {752501D3-5B04-4F3C-A141-DE426E354D23}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "InstallerTobii", "..\InstallerTobii\InstallerTobii.wixproj", "{C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "InstallerW2K", "..\InstallerW2K\InstallerW2K.wixproj", "{C2E1F683-E2B1-4445-9748-E67E1D5156FD}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,7 +100,8 @@
 		Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Debug|Any CPU.Build.0 = Debug|Win32
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -101,7 +135,8 @@
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Any CPU.ActiveCfg = Release|Win32
+		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Any CPU.Build.0 = Release|Win32
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -112,7 +147,8 @@
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Win32.Build.0 = Release|Win32
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{4A4CEB83-FBC8-4E93-831E-009875E54794}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{752501D3-5B04-4F3C-A141-DE426E354D23}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{752501D3-5B04-4F3C-A141-DE426E354D23}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{752501D3-5B04-4F3C-A141-DE426E354D23}.Debug|Any CPU.Build.0 = Debug|Win32
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -144,7 +180,8 @@
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Any CPU.ActiveCfg = Release|Win32
+		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Any CPU.Build.0 = Release|Win32
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -155,7 +192,8 @@
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Win32.Build.0 = Release|Win32
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Debug|Any CPU.Build.0 = Debug|Win32
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -189,7 +227,8 @@
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Any CPU.ActiveCfg = Release|Win32
+		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Any CPU.Build.0 = Release|Win32
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -200,7 +239,8 @@
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Win32.Build.0 = Release|Win32
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{3998D966-9B9E-4214-ACEA-B777985AF4DD}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Debug|Any CPU.Build.0 = Debug|Win32
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -234,7 +274,8 @@
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Any CPU.ActiveCfg = Release|Win32
+		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Any CPU.Build.0 = Release|Win32
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -245,47 +286,6 @@
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Win32.Build.0 = Release|Win32
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Any CPU.ActiveCfg = Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Mixed Platforms.ActiveCfg = Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Mixed Platforms.Build.0 = Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Mixed Platforms.Deploy.0 = Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Mobile Debug|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Pocket PC 2003 (ARMV4).Build.0 = Mobile Debug|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Mobile Debug|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Win32.ActiveCfg = Mobile Debug|Win32
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Win32.Build.0 = Mobile Debug|Win32
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Win32.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Win32.ActiveCfg = Release|Win32
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Win32.Build.0 = Release|Win32
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{0BCE9A66-5ECF-416A-AE25-29E8FDB65A05}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

Modified: trunk/Src/Win32/Dasher_vc80.vcproj
==============================================================================
--- trunk/Src/Win32/Dasher_vc80.vcproj	(original)
+++ trunk/Src/Win32/Dasher_vc80.vcproj	Wed Apr 16 18:46:20 2008
@@ -53,7 +53,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;;&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;;&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;ISOLATION_AWARE_ENABLED"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib WS2_32.lib Htmlhelp.lib Uxtheme.lib &quot;c:\program files\Expat 2.0.1\Bin\libexpat.lib&quot;"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib WS2_32.lib Htmlhelp.lib Uxtheme.lib &quot;$(EXPAT)\Bin\libexpat.lib&quot;"
 				OutputFile=".\Target/Debug/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
 				AdditionalManifestDependencies="&quot;type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Target/Debug/Dasher.pdb"
@@ -151,7 +151,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -182,7 +182,7 @@
 				OutputFile=".\Target/Debug/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Target/Debug/Dasher.pdb"
 				SubSystem="2"
@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -277,7 +277,7 @@
 				OutputFile=".\Target/Debug/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Target/Debug/Dasher.pdb"
 				SubSystem="2"
@@ -342,7 +342,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\Expat 2.0.1\Source\lib&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;$(EXPAT)\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;ISOLATION_AWARE_ENABLED"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -371,11 +371,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib WS2_32.lib Htmlhelp.lib Uxtheme.lib &quot;c:\program files\Expat 2.0.1\Bin\libexpat.lib&quot;"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib WS2_32.lib Htmlhelp.lib Uxtheme.lib &quot;$(EXPAT)\Bin\libexpat.lib&quot;"
 				OutputFile=".\Target/Release/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;"
 				AdditionalManifestDependencies="&quot;type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
@@ -444,7 +444,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -477,7 +477,7 @@
 				OutputFile=".\Target/Release/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
@@ -545,7 +545,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -578,7 +578,7 @@
 				OutputFile=".\Target/Release/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
@@ -643,7 +643,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -676,7 +676,7 @@
 				OutputFile=".\Target/Debug/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Target/Debug/Dasher.pdb"
 				SubSystem="2"
@@ -740,7 +740,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -771,7 +771,7 @@
 				OutputFile=".\Target/Debug/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Target/Debug/Dasher.pdb"
 				SubSystem="2"
@@ -836,7 +836,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="WinCommon;Common;&quot;C:\Program Files\Microsoft Speech SDK 5.1\Include&quot;;&quot;C:\Program Files\Microsoft Tablet PC Platform SDK\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib&quot;"
+				AdditionalIncludeDirectories="WinCommon;Common;&quot;$(SPEECHSDK)\Include&quot;;&quot;$(TABLETSDK)\Include&quot;;&quot;C:\Program Files\HTML Help Workshop\include&quot;;&quot;C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WCE=0x501;WINCE;UNDER_CE;_ARM_"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -866,7 +866,7 @@
 				OutputFile=".\Target/Debug/Dasher.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(SPEECHSDK)\Lib\i386&quot;;&quot;C:\Program Files\HTML Help Workshop\lib&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Target/Debug/Dasher.pdb"
 				SubSystem="9"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]