GNOME.org
 

[dasher: 28/217] Fixed WIX hardcoded paths to use WIX environment variable.

commit 03a4be3931dcceaa381a15520f73f1940aa0387f
Author: Ron Bessems <ron b promixis com>
Date:   Fri Sep 11 17:22:20 2015 -0400

    Fixed WIX hardcoded paths to use WIX environment variable.

 Src/DasherCore/DasherCore_vc2013.vcxproj  |    6 +-
 Src/Installer/Dasher.wxs                  |    4 +-
 Src/Installer/Installer.wixproj           |   10 +-
 Src/InstallerTobii/InstallerTobii.wixproj |   10 +-
 Src/InstallerTobii/InstallerTobii.wxs     |    2 +-
 Src/InstallerW2K/InstallerW2K.wixproj     |   10 +-
 Src/InstallerW2K/InstallerW2K.wxs         |    2 +-
 Src/Win32/DasherControl_vc2013.vcxproj    |    4 +
 Src/Win32/Dasher_vc2013.sln               |  186 +++++++++++++---------------
 Src/Win32/Dasher_vc2013.vcxproj           |   12 ++-
 10 files changed, 123 insertions(+), 123 deletions(-)
---
diff --git a/Src/DasherCore/DasherCore_vc2013.vcxproj b/Src/DasherCore/DasherCore_vc2013.vcxproj
index 72529ba..ff504d1 100644
--- a/Src/DasherCore/DasherCore_vc2013.vcxproj
+++ b/Src/DasherCore/DasherCore_vc2013.vcxproj
@@ -74,18 +74,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\Target/Release\</OutDir>
     <IntDir>.\Target/Release/Intermediate\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>.\Target/Debug\</OutDir>
     <IntDir>.\Target/Debug/Intermediate\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mobile Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (W2K)|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -375,4 +379,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Src/Installer/Dasher.wxs b/Src/Installer/Dasher.wxs
index 115d340..c9649c4 100644
--- a/Src/Installer/Dasher.wxs
+++ b/Src/Installer/Dasher.wxs
@@ -150,7 +150,7 @@
                 <!--<File Id="alphabet.perl.xml" Name="alphabet.perl.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.perl.xml" />-->
                 <File Id="alphabet.persian.xml" Name="alphabet.persian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.persian.xml" />
                 <File Id="alphabet.pinyin.xml" Name="alphabet.pinyin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin.xml" />
-                <!--<File Id="alphabet.pinyin2.xml" Name="alphabet.pinyin2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin2.xml" />-->
+                <File Id="alphabet.pinyin2.xml" Name="alphabet.pinyin2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin2.xml" />
                 <File Id="alphabet.polish.xml" Name="alphabet.polish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.polish.xml" />
                 <File Id="alphabet.portuguese.xml" Name="alphabet.portuguese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.portuguese.xml" />
                 <File Id="alphabet.romansch.xml" Name="alphabet.romansch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.romansch.xml" />
@@ -176,7 +176,7 @@
                 <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_BD.txt" />
                 <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_bn.txt" />-->
                 <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_canna_JP.txt" />
-                <File Id="training_spyDict.txt" Name="training_spyDict.txt" DiskId="1" 
Source="..\..\Data\training\training_spyDict.txt" />
+                <!--<File Id="training_spyDict.txt" Name="training_spyDict.txt" DiskId="1" 
Source="..\..\Data\training\training_spyDict.txt" />-->
                 <File Id="training_czech_CS.txt" Name="training_czech_CS.txt" DiskId="1" 
Source="..\..\Data\training\training_czech_CS.txt" />
                 <File Id="training_danish_DK.txt" Name="training_danish_DK.txt" DiskId="1" 
Source="..\..\Data\training\training_danish_DK.txt" />
                 <File Id="training_dutch_NL.txt" Name="training_dutch_NL.txt" DiskId="1" 
Source="..\..\Data\training\training_dutch_NL.txt" />
diff --git a/Src/Installer/Installer.wixproj b/Src/Installer/Installer.wixproj
index f96ebb5..ab8c278 100644
--- a/Src/Installer/Installer.wixproj
+++ b/Src/Installer/Installer.wixproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; 
ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProductVersion>3.0</ProductVersion>
@@ -6,7 +6,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Dasher 4.11</OutputName>
     <OutputType>Package</OutputType>
-    <WixToolPath>C:\Program Files\Windows Installer XML v3\bin\</WixToolPath>
+    <WixToolPath>$(WIX)\bin\</WixToolPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -125,8 +125,8 @@
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
-      <HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
+      <HintPath>$(WIX)\bin\WixUIExtension.dll</HintPath>
     </WixExtension>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
-</Project>
+  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\WiX\v3.x\Wix.targets" />
+</Project>
\ No newline at end of file
diff --git a/Src/InstallerTobii/InstallerTobii.wixproj b/Src/InstallerTobii/InstallerTobii.wixproj
index 77092ad..a2c9ded 100644
--- a/Src/InstallerTobii/InstallerTobii.wixproj
+++ b/Src/InstallerTobii/InstallerTobii.wixproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; 
ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProductVersion>3.0</ProductVersion>
@@ -6,7 +6,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Dasher 4.10 (MyTobii)</OutputName>
     <OutputType>Package</OutputType>
-    <WixToolPath>$(ProgramFiles)\Windows Installer XML v3\bin\</WixToolPath>
+    <WixToolPath>$(WIX)\bin\</WixToolPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -86,10 +86,10 @@
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
-      <HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
+      <HintPath>$(WIX)\bin\WixUIExtension.dll</HintPath>
     </WixExtension>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
   <!--
        To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Wix.targets.
@@ -98,4 +98,4 @@
        <Target Name="AfterBuild">
        </Target>
        -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Src/InstallerTobii/InstallerTobii.wxs b/Src/InstallerTobii/InstallerTobii.wxs
index ccb4064..052f249 100644
--- a/Src/InstallerTobii/InstallerTobii.wxs
+++ b/Src/InstallerTobii/InstallerTobii.wxs
@@ -171,7 +171,7 @@
               </Component>
               <Component Id="Training" Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
                 <File Id="training_albanian_SQ.txt" Name="training_albanian_SQ.txt" DiskId="1" 
Source="..\..\Data\training\training_albanian_SQ.txt" />
-                <File Id="training_basque_EU.txt" Name="training_basque_EU.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_EU.txt" />
+                <File Id="training_basque_ES.txt" Name="training_basque_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_ES.txt" />
                 <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_BD.txt" />
                 <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_bn.txt" />-->
                 <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_canna_JP.txt" />
diff --git a/Src/InstallerW2K/InstallerW2K.wixproj b/Src/InstallerW2K/InstallerW2K.wixproj
index 1b6318f..8003197 100644
--- a/Src/InstallerW2K/InstallerW2K.wixproj
+++ b/Src/InstallerW2K/InstallerW2K.wixproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; 
ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProductVersion>3.0</ProductVersion>
@@ -6,7 +6,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Dasher 4.10 (W2K)</OutputName>
     <OutputType>Package</OutputType>
-    <WixToolPath>$(ProgramFiles)\Windows Installer XML v3\bin\</WixToolPath>
+    <WixToolPath>$(WIX)\bin\</WixToolPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -52,10 +52,10 @@
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
-      <HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
+      <HintPath>$(WIX)\bin\WixUIExtension.dll</HintPath>
     </WixExtension>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
   <!--
        To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Wix.targets.
@@ -64,4 +64,4 @@
        <Target Name="AfterBuild">
        </Target>
        -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Src/InstallerW2K/InstallerW2K.wxs b/Src/InstallerW2K/InstallerW2K.wxs
index 8331ffb..4f6901f 100644
--- a/Src/InstallerW2K/InstallerW2K.wxs
+++ b/Src/InstallerW2K/InstallerW2K.wxs
@@ -171,7 +171,7 @@
               </Component>
               <Component Id="Training" Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
                 <File Id="training_albanian_SQ.txt" Name="training_albanian_SQ.txt" DiskId="1" 
Source="..\..\Data\training\training_albanian_SQ.txt" />
-                <File Id="training_basque_EU.txt" Name="training_basque_EU.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_EU.txt" />
+                <File Id="training_basque_ES.txt" Name="training_basque_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_ES.txt" />
                 <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_BD.txt" />
                 <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_bn.txt" />-->
                 <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_canna_JP.txt" />
diff --git a/Src/Win32/DasherControl_vc2013.vcxproj b/Src/Win32/DasherControl_vc2013.vcxproj
index 40e3d9b..c55557d 100644
--- a/Src/Win32/DasherControl_vc2013.vcxproj
+++ b/Src/Win32/DasherControl_vc2013.vcxproj
@@ -71,18 +71,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>.\Target/Debug\</OutDir>
     <IntDir>.\Target/Debug/Intermediate\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\Target/Release\</OutDir>
     <IntDir>.\Target/Release/Intermediate\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mobile Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (W2K)|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/Src/Win32/Dasher_vc2013.sln b/Src/Win32/Dasher_vc2013.sln
index 3cfd4a4..d70793f 100644
--- a/Src/Win32/Dasher_vc2013.sln
+++ b/Src/Win32/Dasher_vc2013.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", 
"{4333F263-1911-4128-A577-2BE0B970B0CA}"
        ProjectSection(SolutionItems) = preProject
@@ -21,30 +21,18 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "..\Installer\I
        ProjectSection(ProjectDependencies) = postProject
                {752501D3-5B04-4F3C-A141-DE426E354D23} = {752501D3-5B04-4F3C-A141-DE426E354D23}
        EndProjectSection
-       ProjectSection(WebsiteProperties) = preProject
-               Debug.AspNetCompiler.Debug = "True"
-               Release.AspNetCompiler.Debug = "False"
-       EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "InstallerTobii", 
"..\InstallerTobii\InstallerTobii.wixproj", "{C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}"
        ProjectSection(ProjectDependencies) = postProject
                {752501D3-5B04-4F3C-A141-DE426E354D23} = {752501D3-5B04-4F3C-A141-DE426E354D23}
        EndProjectSection
-       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(ProjectDependencies) = postProject
                {752501D3-5B04-4F3C-A141-DE426E354D23} = {752501D3-5B04-4F3C-A141-DE426E354D23}
        EndProjectSection
-       ProjectSection(WebsiteProperties) = preProject
-               Debug.AspNetCompiler.Debug = "True"
-               Release.AspNetCompiler.Debug = "False"
-       EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual", "..\..\Data\Help\Manual_vc2013.vcxproj", 
"{C356A954-2E47-4F1E-AE4A-E22B598514F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual_vc2013", 
"..\..\Data\Help\Manual_vc2013.vcxproj", "{C356A954-2E47-4F1E-AE4A-E22B598514F9}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -197,92 +185,90 @@ Global
                {192C1E5C-2D1E-4AA3-91C3-FF2D7ABD67F8}.Release|Win32.ActiveCfg = Release|Win32
                {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|Win32
-               {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
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Any CPU.Build.0 = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = 
Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Win32.ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Any CPU.ActiveCfg = Release (W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Any CPU.Build.0 = Release (W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Mixed Platforms.ActiveCfg = Release 
(W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Mixed Platforms.Build.0 = Release 
(W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = 
Release (W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Win32.ActiveCfg = Release (W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release (W2K)|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Any CPU.Build.0 = Release|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any 
CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Win32.ActiveCfg = Release|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Win32.Build.0 = Release|Any CPU
-               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Any CPU.Build.0 = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = 
Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Win32.ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Any CPU.ActiveCfg = Release (W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Any CPU.Build.0 = Release (W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Mixed Platforms.ActiveCfg = Release 
(W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Mixed Platforms.Build.0 = Release 
(W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = 
Release (W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Win32.ActiveCfg = Release (W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release (W2K)|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Any CPU.Build.0 = Release|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any 
CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Win32.ActiveCfg = Release|Any CPU
-               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Win32.ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Any CPU.Build.0 = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = 
Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Win32.ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Any CPU.ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Any CPU.Build.0 = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Mixed Platforms.ActiveCfg = Release|Any 
CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Mixed Platforms.Build.0 = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = 
Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Win32.ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Win32.Build.0 = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Any CPU.Build.0 = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any 
CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Win32.ActiveCfg = Release|Any CPU
-               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|Any CPU
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Win32.ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Win32.Build.0 = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Any CPU.ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Mixed Platforms.Build.0 = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = 
Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Win32.ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Win32.Build.0 = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Any CPU.ActiveCfg = Release (W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Mixed Platforms.ActiveCfg = Release 
(W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Mixed Platforms.Build.0 = Release 
(W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = 
Release (W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Win32.ActiveCfg = Release (W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Win32.Build.0 = Release (W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release (W2K)|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Any CPU.ActiveCfg = Release|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Mixed Platforms.Build.0 = Release|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Win32.ActiveCfg = Release|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Win32.Build.0 = Release|x86
+               {BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Win32.ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Win32.Build.0 = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Any CPU.ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Mixed Platforms.Build.0 = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = 
Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Win32.ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Win32.Build.0 = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Any CPU.ActiveCfg = Release (W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Mixed Platforms.ActiveCfg = Release 
(W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Mixed Platforms.Build.0 = Release 
(W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = 
Release (W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Win32.ActiveCfg = Release (W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Win32.Build.0 = Release (W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release (W2K)|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Any CPU.ActiveCfg = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Mixed Platforms.ActiveCfg = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Mixed Platforms.Build.0 = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Win32.ActiveCfg = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Win32.Build.0 = Release|x86
+               {C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Release|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Mixed Platforms.Build.0 = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Win32.ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Win32.Build.0 = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Any CPU.ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Mixed Platforms.Build.0 = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = 
Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Win32.ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Win32.Build.0 = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Debug|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Any CPU.ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Mixed Platforms.ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Mixed Platforms.Build.0 = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = 
Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Win32.ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Win32.Build.0 = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Any CPU.ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Mixed Platforms.ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Mixed Platforms.Build.0 = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Win32.ActiveCfg = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Win32.Build.0 = Release|x86
+               {C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Windows Mobile 5.0 Pocket PC SDK 
(ARMV4I).ActiveCfg = Release|x86
                {C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Any CPU.ActiveCfg = Debug|Win32
                {C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
                {C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
diff --git a/Src/Win32/Dasher_vc2013.vcxproj b/Src/Win32/Dasher_vc2013.vcxproj
index 5f68e51..50cb9d2 100644
--- a/Src/Win32/Dasher_vc2013.vcxproj
+++ b/Src/Win32/Dasher_vc2013.vcxproj
@@ -61,16 +61,22 @@
     <OutDir>.\Target/Debug\</OutDir>
     <IntDir>.\Target/Debug/Intermediate\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\Target/Release\</OutDir>
     <IntDir>.\Target/Release/Intermediate\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mobile Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <IncludePath>$(EXPAT)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -82,7 +88,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>WinCommon;Common;$(SPEECHSDK)\Include;$(TABLETSDK)\Include;C:\Program 
Files\HTML Help 
Workshop\include;$(EXPAT)\Source\lib;$(MICROSOFTSDK5)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>WinCommon;Common;$(SPEECHSDK)\Include;$(TABLETSDK)\Include;C:\Program 
Files\HTML Help 
Workshop\include;$(EXPAT)\Source\lib;$(MICROSOFTSDK5)\include;%(AdditionalIncludeDirectories);C:\Devel\expat\expat\lib;C:\Devel\expat\expat\lib</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;WIN32_SPEECH;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -125,7 +131,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      
<AdditionalIncludeDirectories>WinCommon;Common;$(SPEECHSDK)\Include;$(TABLETSDK)\Include;$(EXPAT)\Source\lib;$(MICROSOFTSDK5)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>WinCommon;Common;$(SPEECHSDK)\Include;$(TABLETSDK)\Include;$(EXPAT)\Source\lib;$(MICROSOFTSDK5)\include;%(AdditionalIncludeDirectories);C:\Devel\expat\expat\lib;C:\Devel\expat\expat\lib</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;WIN32_SPEECH;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -167,7 +173,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>WinCommon;Common;$(SPEECHSDK)\Include;$(TABLETSDK)\Include;C:\Program 
Files\HTML Help Workshop\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>WinCommon;Common;$(SPEECHSDK)\Include;$(TABLETSDK)\Include;C:\Program 
Files\HTML Help 
Workshop\include;%(AdditionalIncludeDirectories);C:\Devel\expat\expat\lib;C:\Devel\expat\expat\lib</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;WIN32_SPEECH;_DEBUG;_WINDOWS;_UNICODE;_STATIC;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]