Commit 32919cdc authored by Keith Vertanen's avatar Keith Vertanen
Browse files

Fixed expat path in wix XML

svn path=/trunk/; revision=3502
parent e444e7d5
2008-03-30 Keith Vertanen <kv227@cam.ac.uk>
* Replaced hard coded include and library paths in projects with
versions which use environment variables: TABLETSDK, SPEECHSDK
and EXPAT.
* Removed Expat project from solution.
* Fixed target platform for the debug and release configurations.
2008-03-30 Aaron Larson <aaron@larsonsonline.net>
* Minor changes for HIG compliance (#511808).
......
Building Dasher for Microsoft Windows
=====================================
Prerequisites
-------------
Microsoft Speech SDK
Microsoft Tablet SDK
Both SDKs can be installed individually, or as part of the Platform SDK. Downloads
can be found at http://www.microsoft.com
Visual Studio should be configured with the appropriate include and library directories
Tools->Options->Projects->VC++ directories
Example includes (exact paths depend upon installation directory)
C:\Program Files\Microsoft Speech SDK 5.1\Include
C:\Program Files\Microsoft Tablet PC Platform SDK\Include
Example libraries:
C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386
C:\Program Files\Microsoft Tablet PC Platform SDK\Bin
Building
--------
A Visual Studio 7.1 solution file is included in the Src/Win32
directory. This should hopefully build without modification on any
system.
For earlier versions of Visual Studio, alternative project files are
provided, although these may be out-of-date. Please consider the 7.1
project file to be authoritative, and port any modifications to that
if possible (or at least tell us so we can do it).
Building Dasher for Microsoft Windows
=====================================
Prerequisites
-------------
Microsoft Speech SDK
Microsoft Tablet SDK
Expat XML Parser
The Speech and Tablet SDKs can be installed individually, or as part of the
Platform SDK. Downloads can be found at http://www.microsoft.com and
http://expat.sourceforge.net
The project files use environment variables to locate the root directories of
the prerequisites. You can set these in the Windows control panel:
Control Panels->System->Advanced->Environment Variables.
Here are the variable names and their default install locations:
SPEECHSDK C:\Program Files\Microsoft Speech SDK 5.1
TABLETSDK C:\Program Files\Microsoft Tablet PC Platform SDK
EXPAT C:\Program Files\Expat 2.0.1
You should insure that your Visual Studio-wide VC++ directories don't have
include or library directories for the platform SDK, look in: Tools->Options->
Project and Solutions->VC++ Directories.
Building
--------
Visual Studio 8.0 (2005) solution/project files are included in the
Src/Win32 directory. This should hopefully build without modification on
any system.
For earlier versions of Visual Studio, alternative project files are
provided, although these may be out-of-date. Please consider the 8.0
files to be authoritative, and port any modifications to that if possible
(or at least tell us so we can do it).
......@@ -24,7 +24,7 @@
<Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.7" WorkingDirectory='INSTALLDIR'
Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
</File>
<File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="..\Win32\Target\Release\libexpat.dll" Vital="yes"/>
<File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\bin\libexpat.dll" Vital="yes"/>
</Component>
<Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
<File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
......
......@@ -124,7 +124,9 @@
<Compile Include="Dasher.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
<WixExtension Include="WixUIExtension">
<HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
</WixExtension>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
</Project>
\ No newline at end of file
......@@ -85,7 +85,9 @@
<Compile Include="InstallerTobii.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
<WixExtension Include="WixUIExtension">
<HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
</WixExtension>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
<!--
......
......@@ -24,7 +24,7 @@
<Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.6" WorkingDirectory='INSTALLDIR'
Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
</File>
<File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="..\Win32\Target\Release\libexpat.dll" Vital="yes"/>
<File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\libexpat.dll" Vital="yes"/>
</Component>
<Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
<File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
......
......@@ -51,7 +51,9 @@
<Compile Include="InstallerW2K.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
<WixExtension Include="WixUIExtension">
<HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
</WixExtension>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
<!--
......
......@@ -24,7 +24,7 @@
<Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.6" WorkingDirectory='INSTALLDIR'
Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
</File>
<File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="..\Win32\Target\Release\libexpat.dll" Vital="yes"/>
<File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\libexpat.dll" Vital="yes"/>
</Component>
<Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
<File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment