[sword-svn] r63 - in trunk/src: . installer simplegui

bdrake at www.crosswire.org bdrake at www.crosswire.org
Thu Dec 20 09:20:54 MST 2007


Author: bdrake
Date: 2007-12-20 09:20:53 -0700 (Thu, 20 Dec 2007)
New Revision: 63

Added:
   trunk/src/installer/
   trunk/src/installer/AssemblyInfo.cpp
   trunk/src/installer/Form1.h
   trunk/src/installer/Form1.resx
   trunk/src/installer/SRInstallMGR.cpp
   trunk/src/installer/SRInstallMGR.sln
   trunk/src/installer/SRInstallMGR.vcproj
   trunk/src/installer/app.rc
   trunk/src/installer/doInstall.cpp
   trunk/src/installer/doInstall.h
   trunk/src/installer/resource.h
   trunk/src/installer/stdafx.cpp
   trunk/src/installer/stdafx.h
   trunk/src/installer/sword.ico
Modified:
   trunk/src/SwRd.vcb
   trunk/src/SwRd.vco
   trunk/src/simplegui/simplegui.aps
   trunk/src/simplegui/simplegui.vcl
   trunk/src/simplegui/simplegui.vcp
Log:


Modified: trunk/src/SwRd.vcb
===================================================================
(Binary files differ)

Modified: trunk/src/SwRd.vco
===================================================================
(Binary files differ)

Added: trunk/src/installer/AssemblyInfo.cpp
===================================================================
--- trunk/src/installer/AssemblyInfo.cpp	                        (rev 0)
+++ trunk/src/installer/AssemblyInfo.cpp	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,40 @@
+#include "stdafx.h"
+
+using namespace System;
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+using namespace System::Security::Permissions;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly:AssemblyTitleAttribute("SRInstallMGR")];
+[assembly:AssemblyDescriptionAttribute("")];
+[assembly:AssemblyConfigurationAttribute("")];
+[assembly:AssemblyCompanyAttribute("")];
+[assembly:AssemblyProductAttribute("SRInstallMGR")];
+[assembly:AssemblyCopyrightAttribute("Copyright (c)  2007")];
+[assembly:AssemblyTrademarkAttribute("")];
+[assembly:AssemblyCultureAttribute("")];
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the value or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersionAttribute("1.0.*")];
+
+[assembly:ComVisible(false)];
+
+[assembly:CLSCompliantAttribute(true)];
+
+[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];

Added: trunk/src/installer/Form1.h
===================================================================
--- trunk/src/installer/Form1.h	                        (rev 0)
+++ trunk/src/installer/Form1.h	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,148 @@
+#pragma once
+#include "doInstall.h"
+
+namespace SRInstallMGR {
+
+	using namespace System;
+	using namespace System::ComponentModel;
+	using namespace System::Collections;
+	using namespace System::Windows::Forms;
+	using namespace System::Data;
+	using namespace System::Drawing;
+
+	/// <summary>
+	/// Summary for Form1
+	///
+	/// WARNING: If you change the name of this class, you will need to change the
+	///          'Resource File Name' property for the managed resource compiler tool
+	///          associated with all .resx files this class depends on.  Otherwise,
+	///          the designers will not be able to interact properly with localized
+	///          resources associated with this form.
+	/// </summary>
+	public ref class Form1 : public System::Windows::Forms::Form
+	{
+	public:
+		Form1(void)
+		{
+			InitializeComponent();
+			//
+			//TODO: Add the constructor code here
+			//
+		}
+
+	protected:
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		~Form1()
+		{
+			if (components)
+			{
+				delete components;
+			}
+		}
+	private: System::Windows::Forms::Button^  button1;
+	protected: 
+
+	private: System::Windows::Forms::Button^  button2;
+	private: System::Windows::Forms::TextBox^  textBox1;
+
+
+	private:
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		System::ComponentModel::Container ^components;
+
+#pragma region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		void InitializeComponent(void)
+		{
+			System::ComponentModel::ComponentResourceManager^  resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid));
+			this->button1 = (gcnew System::Windows::Forms::Button());
+			this->button2 = (gcnew System::Windows::Forms::Button());
+			this->textBox1 = (gcnew System::Windows::Forms::TextBox());
+			this->SuspendLayout();
+			// 
+			// button1
+			// 
+			this->button1->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 12, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point, 
+				static_cast<System::Byte>(0)));
+			this->button1->Location = System::Drawing::Point(34, 229);
+			this->button1->Name = L"button1";
+			this->button1->Size = System::Drawing::Size(206, 98);
+			this->button1->TabIndex = 0;
+			this->button1->Text = L"Start Cataloguing";
+			this->button1->UseVisualStyleBackColor = true;
+			this->button1->Click += gcnew System::EventHandler(this, &Form1::button1_Click);
+			this->button1->MouseEnter += gcnew System::EventHandler(this, &Form1::button1_MouseEnter);
+			// 
+			// button2
+			// 
+			this->button2->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 10, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point, 
+				static_cast<System::Byte>(0)));
+			this->button2->Location = System::Drawing::Point(305, 231);
+			this->button2->Name = L"button2";
+			this->button2->Size = System::Drawing::Size(83, 96);
+			this->button2->TabIndex = 2;
+			this->button2->Text = L"CANCEL";
+			this->button2->UseVisualStyleBackColor = true;
+			this->button2->Click += gcnew System::EventHandler(this, &Form1::button2_Click);
+			// 
+			// textBox1
+			// 
+			this->textBox1->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 11, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, 
+				static_cast<System::Byte>(0)));
+			this->textBox1->Location = System::Drawing::Point(34, 12);
+			this->textBox1->Multiline = true;
+			this->textBox1->Name = L"textBox1";
+			this->textBox1->Size = System::Drawing::Size(354, 211);
+			this->textBox1->TabIndex = 3;
+			this->textBox1->Text = resources->GetString(L"textBox1.Text");
+			this->textBox1->TextAlign = System::Windows::Forms::HorizontalAlignment::Center;
+			// 
+			// Form1
+			// 
+			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
+			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
+			this->ClientSize = System::Drawing::Size(412, 332);
+			this->Controls->Add(this->textBox1);
+			this->Controls->Add(this->button2);
+			this->Controls->Add(this->button1);
+			this->Name = L"Form1";
+			this->Text = L"SwordReader module installer";
+			this->ResumeLayout(false);
+			this->PerformLayout();
+
+		}
+
+#pragma endregion
+	
+
+	private: System::Void button1_Click(System::Object^  sender, System::EventArgs^  e) {
+				textBox1->Clear();
+				textBox1->Text = "*WORKING*";
+				const char* OutStr = doInstall();
+				Application::Exit();
+
+			 }
+
+
+	private: System::Void button2_Click(System::Object^  sender, System::EventArgs^  e) {
+			 Application::Exit();			 
+			 }
+	private: System::Void textBox1_MouseEnter(System::Object^  sender, System::EventArgs^  e) {
+			//	textBox1->Clear();
+			 }
+private: System::Void button1_Enter(System::Object^  sender, System::EventArgs^  e) {
+		 }
+private: System::Void button1_MouseEnter(System::Object^  sender, System::EventArgs^  e) {
+				textBox1->Clear();
+				textBox1->Text = "Click button and wait for Install Manager screen.  We first need to catalogue your existing modules. This may take a few seconds ..... please wait!";
+		 }
+};
+}
+

Added: trunk/src/installer/Form1.resx
===================================================================
--- trunk/src/installer/Form1.resx	                        (rev 0)
+++ trunk/src/installer/Form1.resx	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="textBox1.Text" xml:space="preserve">
+    <value>About to start cataloguing the Sword installation on your device.
+
+This assumes that there is already a valid installation of SwordReader on the connected device.  If not, then we recommend that you first install the SwordReader starter-pack.
+
+Before clicking on button, ensure that your device is connected, and ActiveSync is in operation and showing connection.</value>
+  </data>
+</root>
\ No newline at end of file

Added: trunk/src/installer/SRInstallMGR.cpp
===================================================================
--- trunk/src/installer/SRInstallMGR.cpp	                        (rev 0)
+++ trunk/src/installer/SRInstallMGR.cpp	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,18 @@
+// SRInstallMGR.cpp : main project file.
+
+#include "stdafx.h"
+#include "Form1.h"
+
+using namespace SRInstallMGR;
+
+[STAThreadAttribute]
+int main(array<System::String ^> ^args)
+{
+	// Enabling Windows XP visual effects before any controls are created
+	Application::EnableVisualStyles();
+	Application::SetCompatibleTextRenderingDefault(false); 
+
+	// Create the main window and run it
+	Application::Run(gcnew Form1());
+	return 0;
+}

Added: trunk/src/installer/SRInstallMGR.sln
===================================================================
--- trunk/src/installer/SRInstallMGR.sln	                        (rev 0)
+++ trunk/src/installer/SRInstallMGR.sln	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SRInstallMGR", "SRInstallMGR.vcproj", "{93737BE7-7BC3-428C-A664-0A1B65AC26CD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{93737BE7-7BC3-428C-A664-0A1B65AC26CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{93737BE7-7BC3-428C-A664-0A1B65AC26CD}.Debug|Win32.Build.0 = Debug|Win32
+		{93737BE7-7BC3-428C-A664-0A1B65AC26CD}.Release|Win32.ActiveCfg = Release|Win32
+		{93737BE7-7BC3-428C-A664-0A1B65AC26CD}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Added: trunk/src/installer/SRInstallMGR.vcproj
===================================================================
--- trunk/src/installer/SRInstallMGR.vcproj	                        (rev 0)
+++ trunk/src/installer/SRInstallMGR.vcproj	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="SRInstallMGR"
+	ProjectGUID="{93737BE7-7BC3-428C-A664-0A1B65AC26CD}"
+	RootNamespace="SRInstallMGR"
+	Keyword="ManagedCProj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\ActiveSync\inc;C:\Program Files\Microsoft eMbedded Tools\include"
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="false"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="rapi.lib $(NOINHERIT)"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Activesync\Lib"
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				SubSystem="2"
+				EntryPointSymbol="main"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(NoInherit)"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				EntryPointSymbol="main"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\AssemblyInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\doInstall.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\SRInstallMGR.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\Form1.h"
+				FileType="3"
+				>
+				<File
+					RelativePath=".\Form1.resX"
+					SubType="Designer"
+					>
+				</File>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\sword.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\app.rc"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: trunk/src/installer/app.rc
===================================================================
--- trunk/src/installer/app.rc	                        (rev 0)
+++ trunk/src/installer/app.rc	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,63 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon placed first or with lowest ID value becomes application icon
+
+LANGUAGE 9, 2
+#pragma code_page(1252)
+1           ICON         "sword.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE  
+BEGIN
+    "resource.h\0"
+    "\0"
+END
+
+2 TEXTINCLUDE  
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE  
+BEGIN
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Added: trunk/src/installer/doInstall.cpp
===================================================================
--- trunk/src/installer/doInstall.cpp	                        (rev 0)
+++ trunk/src/installer/doInstall.cpp	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,189 @@
+#include "stdafx.h"
+#include "Form1.h"
+#include <tchar.h>
+#include <rapi.h>
+
+using namespace SRInstallMGR;
+
+const char *stristr(const char *haystack, const char *needle){ // not mine - nicked this off the 'net
+if ( !*needle )
+	return haystack;
+for ( ; *haystack; ++haystack ){
+	if ( toupper(*haystack) == toupper(*needle) ){
+		const char *h, *n;
+		for ( h = haystack, n = needle; *h && *n; ++h, ++n ){
+			if ( toupper(*h) != toupper(*n) )break;
+			}
+			if ( !*n ) 
+				return haystack; /* return the start of the match */
+		}
+	}
+return 0;
+}
+
+char *wstrtostr(const wchar_t *str) {  // this came out of original SwordReader code - is there a better way?
+  static char *c, *buffer = 0;
+  if (buffer)
+    delete [] buffer;
+  buffer = c = new char[ wcslen(str) + 1 ];
+  while (*str)
+    *c++ = (char)*str++;
+  *c = 0;
+  return buffer;
+}
+
+const char* PrintDirectory(LPWSTR Path, UINT Indent){ // recurse through device from root
+	DWORD          foundCount;
+    LPCE_FIND_DATA findDataArray;
+	TCHAR wszSrcFile[MAX_PATH];
+	WCHAR tszDestFile[MAX_PATH];
+    WCHAR searchPath[MAX_PATH];
+	TCHAR swordPath[MAX_PATH];
+	char swPath[MAX_PATH];
+	const char* swordPathString = swPath;
+	HANDLE hSrc, hDest;
+	BYTE  Buffer[4096];
+    DWORD dwNumRead, dwNumWritten;
+
+    wcscpy(searchPath, Path);
+    wcscat(searchPath, L"*");
+		
+    if(!CeFindAllFiles(searchPath, FAF_ATTRIBUTES | FAF_NAME, &foundCount, &findDataArray)) {
+		_tprintf( TEXT("*** CeFindAllFiles failed. ***\n"));
+		return(NULL);
+	}
+    if(!foundCount) return(NULL);
+    for(UINT i = 0; i < foundCount; i++) {
+		if(findDataArray[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { // directory found
+			WCHAR newPath[MAX_PATH];
+			wcscpy(newPath, Path);
+			wcscat(newPath, findDataArray[i].cFileName);
+			wcscat(newPath, L"\\");
+			PrintDirectory(newPath, Indent + 1);
+		}
+		
+		else if ((stristr(wstrtostr(Path), "MODS.D"))){ // not directory - this is a file
+			const char* modstr = stristr(wstrtostr(Path), "MODS.D");
+			wcscpy(swordPath, Path);
+			int len = strlen (modstr);
+			int swlen = wcslen (swordPath);
+			while (len--) swlen--;
+			swordPath[swlen] = 0;
+
+		/********************************************************************************
+		// don't want to do anything with files except when they are in MODS.D
+		// 'Path' at this point should be your sword home directory+mods.d, so save it
+		// use return from stristr to truncate
+		// I have assumed that mods.d occurs only once!!!  Possible other instance ....
+		// note: have not checked for more than one installation: it is possible for someone
+		// to have installed into two different locations - really! 
+		*********************************************************************************/
+
+			wprintf( TEXT("%s%s\n"),Path, findDataArray[i].cFileName); // for debugging
+			// TODO - now add the filename to a list ready for later stage
+			// copy the file from Ce device to Pc
+		    wcscpy(wszSrcFile, Path);
+
+
+		    wcscat(wszSrcFile, findDataArray[i].cFileName);
+			_tcscpy( tszDestFile, TEXT("mods.d\\"));
+			wcscat( tszDestFile, findDataArray[i].cFileName);
+		    hSrc = CeCreateFile(wszSrcFile, GENERIC_READ, FILE_SHARE_READ,
+                NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+			if (INVALID_HANDLE_VALUE == hSrc) {
+		MessageBox::Show("Sorry, I'm struggling to open a file on your device.", "Process Failed",
+			MessageBoxButtons::OK);
+			Application::Exit();
+			}
+			hDest = CreateFile(tszDestFile, GENERIC_WRITE, FILE_SHARE_READ,
+                NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+			if (INVALID_HANDLE_VALUE == hDest) {
+				// NOTE: there has to be an existing 'mods.d' directory 
+				// in your working directory on the host
+			MessageBox::Show("Sorry, I can't seem to write files to your PC.  Do you have a mods.d directory where you put me?", "Process Failed",
+				MessageBoxButtons::OK);
+			Application::Exit();
+			}	
+			if (CeReadFile(hSrc, &Buffer, sizeof(Buffer), &dwNumRead, NULL)) {
+				if (!WriteFile(hDest, &Buffer, dwNumRead, &dwNumWritten, NULL)) {
+					MessageBox::Show("Sorry, I can't seem to read the files on your mobile device.", "Process Failed",
+							MessageBoxButtons::OK);
+					Application::Exit();
+				}
+			}
+			else {
+				MessageBox::Show("Sorry, I can't read the files on your mobile device.", "Process Failed",
+					MessageBoxButtons::OK);
+				Application::Exit();
+			}
+		} // else if ((stristr(wstrtostr ......
+		// no longer pointing to a mods.d directory, so close file handles
+		if (hSrc){
+			CeCloseHandle( hSrc);
+			hSrc = NULL;
+		}
+		if (hDest){
+			CloseHandle (hDest);
+			hDest = NULL;
+		}
+	} // for(UINT i = 0; ........
+	if (findDataArray)
+        RapiFreeBuffer(findDataArray);
+		swordPathString = wstrtostr(swordPath);
+//		System::Windows::Forms::MessageBox::Show(swPath);
+//		MessageBox(NULL, swPath, "swordPath",
+//							MB_OK);
+	return (swordPathString);
+}
+
+const char* doInstall() {
+
+    RAPIINIT ri = { sizeof(RAPIINIT) };
+    if ( SUCCEEDED(CeRapiInitEx(&ri)))
+    {
+	// wait for 10 seconds for the connection...
+	if ( (WaitForSingleObject(ri.heRapiInit, 10000) == WAIT_OBJECT_0) && 
+             SUCCEEDED(ri.hrRapiInit) ) {
+	const char* swordPath = PrintDirectory( L"\\", 0);
+    CeRapiUninit();
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    ZeroMemory( &si, sizeof(si) );
+    si.cb = sizeof(si);
+    ZeroMemory( &pi, sizeof(pi) );
+    // Start the child process - InstallManager. 
+	if( !CreateProcess( TEXT("InstallManager.exe"), TEXT("InstallManager.exe"), // Command line. 
+		NULL, NULL, FALSE,	0, NULL, NULL, &si, &pi )) {
+			MessageBox::Show("Sorry, I could not activate InstallManager", "Process Failed",
+					MessageBoxButtons::OK);
+			Application::Exit();
+		}
+    // Wait until InstallManager exits.
+    WaitForSingleObject( pi.hProcess, INFINITE );
+    // Close process and thread handles. 
+    CloseHandle( pi.hProcess );
+    CloseHandle( pi.hThread );
+	//MessageBox::Show("Well, looks like we got here", "Success!!!",
+	//		MessageBoxButtons::OK);
+	return (swordPath);
+		}
+    else {
+		MessageBox::Show("Sorry, I could not connect to your mobile device", "CeRapiInit failed",
+			MessageBoxButtons::OK);
+		CeRapiUninit();
+		Application::Exit();
+		}
+    Application::Exit();
+    if ( CeRapiInit() != E_FAIL ) {
+		}
+    else {
+		MessageBox::Show("Sorry, I could not connect to your mobile device", "CeRapiInit failed",
+			MessageBoxButtons::OK);
+		CeRapiUninit();
+		Application::Exit();
+		}	
+	Application::Exit();
+	}
+Application::Exit();
+}
+

Added: trunk/src/installer/doInstall.h
===================================================================
--- trunk/src/installer/doInstall.h	                        (rev 0)
+++ trunk/src/installer/doInstall.h	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,3 @@
+// doInstall.h
+
+const char* doInstall();
\ No newline at end of file

Added: trunk/src/installer/resource.h
===================================================================
--- trunk/src/installer/resource.h	                        (rev 0)
+++ trunk/src/installer/resource.h	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,3 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by app.rc

Added: trunk/src/installer/stdafx.cpp
===================================================================
--- trunk/src/installer/stdafx.cpp	                        (rev 0)
+++ trunk/src/installer/stdafx.cpp	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,7 @@
+// stdafx.cpp : source file that includes just the standard includes
+// TEST.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+

Added: trunk/src/installer/stdafx.h
===================================================================
--- trunk/src/installer/stdafx.h	                        (rev 0)
+++ trunk/src/installer/stdafx.h	2007-12-20 16:20:53 UTC (rev 63)
@@ -0,0 +1,6 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+#pragma once
+
+// TODO: reference additional headers your program requires here

Added: trunk/src/installer/sword.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/installer/sword.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/simplegui/simplegui.aps
===================================================================
(Binary files differ)

Modified: trunk/src/simplegui/simplegui.vcl
===================================================================
--- trunk/src/simplegui/simplegui.vcl	2007-12-17 15:22:31 UTC (rev 62)
+++ trunk/src/simplegui/simplegui.vcl	2007-12-20 16:20:53 UTC (rev 63)
@@ -3,72 +3,63 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: simplegui - Win32 (WCE x86) Debug--------------------
+--------------------Configuration: simplegui - Win32 (WCE ARM) Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"X86Dbg/simplegui.res" /d UNDER_CE=300 /d _WIN32_WCE=300 /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "WIN32_PLATFORM_WFSP=100" /d "_X86_" /d "x86" /d "_i386_" /r "C:\src\swordreader\src\simplegui\simplegui.rc"" 
-Creating temporary file "C:\DOCUME~1\DAVIDT~1\LOCALS~1\Temp\RSP2D6.tmp" with contents
+Creating temporary file "C:\DOCUME~1\q\LOCALS~1\Temp\RSP407.tmp" with contents
 [
-/nologo /W3 /Zi /Od /I "..\Dll1\winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "DEBUG" /D "_i386_" /D UNDER_CE=300 /D _WIN32_WCE=300 /D "WIN32_PLATFORM_WFSP=100" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Fo"X86Dbg/" /Fd"X86Dbg/" /Gs8192 /GF /c 
-"C:\src\swordreader\src\gui\ApplicationInterface.cpp"
-"C:\src\swordreader\src\gui\Main.cpp"
-"C:\src\swordreader\src\gui\NavBooks.cpp"
-"C:\src\swordreader\src\gui\NavChap.cpp"
-"C:\src\swordreader\src\gui\NavFind.cpp"
-"C:\src\swordreader\src\gui\NavNumbers.cpp"
-"C:\src\swordreader\src\gui\NavRenderText.cpp"
-"C:\src\swordreader\src\gui\NavVerse.cpp"
-"C:\src\swordreader\src\gui\SimpleNavigator.cpp"
-"C:\src\swordreader\src\gui\SwordIndex.cpp"
-"C:\src\swordreader\src\gui\TextControl.cpp"
-"C:\src\swordreader\src\gui\Utils.cpp"
-"C:\src\swordreader\src\gui\VerseTextControl.cpp"
+/nologo /W3 /O2 /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /I "winceSword\include" /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "ARM" /D "_ARM_" /D UNDER_CE=300 /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SIMPLE" /FR"ARMRel/" /Fo"ARMRel/" /Oxs /MC /c 
+"C:\Prog\swordreader\src\gui\SimpleNavigator.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\DAVIDT~1\LOCALS~1\Temp\RSP2D6.tmp" 
-Creating temporary file "C:\DOCUME~1\DAVIDT~1\LOCALS~1\Temp\RSP2D7.tmp" with contents
+Creating command line "clarm.exe @C:\DOCUME~1\q\LOCALS~1\Temp\RSP407.tmp" 
+Creating temporary file "C:\DOCUME~1\q\LOCALS~1\Temp\RSP408.tmp" with contents
 [
-corelibc.lib ..\Dll1\X86Dbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:yes /pdb:"X86Dbg/simplegui.pdb" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib /out:"X86Dbg/simplegui.exe" /libpath:"..\STL_eVC" /subsystem:windowsce,3.00 /MACHINE:IX86 
-.\X86Dbg\ApplicationInterface.obj
-.\X86Dbg\Main.obj
-.\X86Dbg\NavBooks.obj
-.\X86Dbg\NavChap.obj
-.\X86Dbg\NavFind.obj
-.\X86Dbg\NavNumbers.obj
-.\X86Dbg\NavRenderText.obj
-.\X86Dbg\NavVerse.obj
-.\X86Dbg\SimpleNavigator.obj
-.\X86Dbg\SwordIndex.obj
-.\X86Dbg\TextControl.obj
-.\X86Dbg\Utils.obj
-.\X86Dbg\VerseTextControl.obj
-.\X86Dbg\simplegui.res
+..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:no /pdb:"ARMRel/simplegui.pdb" /nodefaultlib:"libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib" /out:"ARMRel/simplegui.exe" /libpath:"..\STL_eVC" /subsystem:windowsce,3.00 /align:"4096" /MACHINE:ARM 
+.\ARMRel\ApplicationInterface.obj
+.\ARMRel\Main.obj
+.\ARMRel\NavBooks.obj
+.\ARMRel\NavChap.obj
+.\ARMRel\NavFind.obj
+.\ARMRel\NavNumbers.obj
+.\ARMRel\NavRenderText.obj
+.\ARMRel\NavVerse.obj
+.\ARMRel\SimpleNavigator.obj
+.\ARMRel\SwordIndex.obj
+.\ARMRel\TextControl.obj
+.\ARMRel\Utils.obj
+.\ARMRel\VerseTextControl.obj
+.\ARMRel\simplegui.res
 ]
-Creating command line "link.exe @C:\DOCUME~1\DAVIDT~1\LOCALS~1\Temp\RSP2D7.tmp"
+Creating command line "link.exe @C:\DOCUME~1\q\LOCALS~1\Temp\RSP408.tmp"
 <h3>Output Window</h3>
-Compiling resources...
 Compiling...
-ApplicationInterface.cpp
-Main.cpp
-NavBooks.cpp
-NavChap.cpp
-NavFind.cpp
-NavNumbers.cpp
-NavRenderText.cpp
-NavVerse.cpp
 SimpleNavigator.cpp
-SwordIndex.cpp
-TextControl.cpp
-Utils.cpp
-VerseTextControl.cpp
-Generating Code...
 Linking...
-LINK : fatal error LNK1104: cannot open file "..\Dll1\X86Dbg\sword.lib"
-Error executing link.exe.
+Creating temporary file "C:\DOCUME~1\q\LOCALS~1\Temp\RSP40B.tmp" with contents
+[
+/nologo /o"ARMRel/simplegui.bsc" 
+.\ARMRel\ApplicationInterface.sbr
+.\ARMRel\Main.sbr
+.\ARMRel\NavBooks.sbr
+.\ARMRel\NavChap.sbr
+.\ARMRel\NavFind.sbr
+.\ARMRel\NavNumbers.sbr
+.\ARMRel\NavRenderText.sbr
+.\ARMRel\NavVerse.sbr
+.\ARMRel\SimpleNavigator.sbr
+.\ARMRel\SwordIndex.sbr
+.\ARMRel\TextControl.sbr
+.\ARMRel\Utils.sbr
+.\ARMRel\VerseTextControl.sbr]
+Creating command line "bscmake.exe @C:\DOCUME~1\q\LOCALS~1\Temp\RSP40B.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
 
 
 
+
 <h3>Results</h3>
-simplegui.exe - 1 error(s), 0 warning(s)
+simplegui.exe - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>

Modified: trunk/src/simplegui/simplegui.vcp
===================================================================
--- trunk/src/simplegui/simplegui.vcp	2007-12-17 15:22:31 UTC (rev 62)
+++ trunk/src/simplegui/simplegui.vcp	2007-12-20 16:20:53 UTC (rev 63)
@@ -86,8 +86,7 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /W3 /Zi /Od /I "..\Dll1\winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -96,7 +95,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 ..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\STL_eVC" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 ..\Dll1\ARMDbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\STL_eVC" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
@@ -120,8 +119,7 @@
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /Oxs /c
-# ADD CPP /nologo /W3 /I "winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gs8192 /GF /Oxs /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /W3 /I "..\Dll1\winceSword\include" /I "..\STL_eVC" /I "..\..\..\sword\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gs8192 /GF /Oxs /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -130,7 +128,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
-# ADD LINK32 $(CEx86Corelibc) ..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"..\STL_eVC" /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) ..\Dll1\X86Rel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /map /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /nodefaultlib /libpath:"..\STL_eVC" /subsystem:$(CESubsystem) /MACHINE:IX86
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
@@ -196,6 +194,8 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_APPLI=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Utils.h"\
 	
@@ -207,6 +207,8 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_APPLI=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Utils.h"\
 	
@@ -276,6 +278,28 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MAIN_=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Main.h"\
 	"..\gui\Navigator.h"\
@@ -293,6 +317,28 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_MAIN_=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\Main.h"\
 	"..\gui\Navigator.h"\
@@ -389,9 +435,30 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_NAVBO=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavBooks.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
@@ -401,9 +468,30 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_NAVBO=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavBooks.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
@@ -489,28 +577,72 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_NAVCH=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavChap.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_NAVCH=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavChap.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -597,24 +729,68 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_NAVFI=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_NAVFI=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -695,8 +871,29 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_NAVNU=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
@@ -707,8 +904,29 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_NAVNU=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\SimpleNavigator.h"\
@@ -795,32 +1013,72 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_NAVRE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\NavRenderText.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	"..\gui\VerseTextControl.h"\
 	
-NODEP_CPP_NAVRE=\
-	".\tmlctrl.h"\
-	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_NAVRE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\NavRenderText.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	"..\gui\VerseTextControl.h"\
 	
-NODEP_CPP_NAVRE=\
-	".\tmlctrl.h"\
-	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 
@@ -904,28 +1162,72 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_NAVVE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\NavVerse.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_NAVVE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavFind.h"\
-	"..\gui\Navigator.h"\
 	"..\gui\NavNumbers.h"\
 	"..\gui\NavPage.h"\
 	"..\gui\NavVerse.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -1017,6 +1319,28 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SIMPL=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavBooks.h"\
 	"..\gui\NavChap.h"\
@@ -1027,12 +1351,36 @@
 	"..\gui\NavVerse.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	"..\gui\VerseTextControl.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_SIMPL=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\NavBooks.h"\
 	"..\gui\NavChap.h"\
@@ -1043,7 +1391,9 @@
 	"..\gui\NavVerse.h"\
 	"..\gui\SimpleNavigator.h"\
 	"..\gui\SwordIndex.h"\
+	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
+	"..\gui\VerseTextControl.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -1133,6 +1483,31 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SWORD=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\SwordIndex.h"\
 	"..\gui\Utils.h"\
@@ -1144,6 +1519,31 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_SWORD=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\encfiltmgr.h"\
+	"..\..\..\sword\include\listkey.h"\
+	"..\..\..\sword\include\markupfiltmgr.h"\
+	"..\..\..\sword\include\multimapwdef.h"\
+	"..\..\..\sword\include\swbasicfilter.h"\
+	"..\..\..\sword\include\swbuf.h"\
+	"..\..\..\sword\include\swcacher.h"\
+	"..\..\..\sword\include\swconfig.h"\
+	"..\..\..\sword\include\swdisp.h"\
+	"..\..\..\sword\include\swfilter.h"\
+	"..\..\..\sword\include\swfiltermgr.h"\
+	"..\..\..\sword\include\swkey.h"\
+	"..\..\..\sword\include\swmacs.h"\
+	"..\..\..\sword\include\swmgr.h"\
+	"..\..\..\sword\include\swmodule.h"\
+	"..\..\..\sword\include\swobject.h"\
+	"..\..\..\sword\include\swoptfilter.h"\
+	"..\..\..\sword\include\swsearchable.h"\
+	"..\..\..\sword\include\swtext.h"\
+	"..\..\..\sword\include\thmlhtml.h"\
+	"..\..\..\sword\include\thmlvariants.h"\
+	"..\..\..\sword\include\versekey.h"\
+	"..\..\..\sword\include\ztext.h"\
+	"..\..\..\sword\include\zverse.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\SwordIndex.h"\
 	"..\gui\Utils.h"\
@@ -1210,6 +1610,8 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_TEXTC=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
@@ -1221,6 +1623,8 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_TEXTC=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
@@ -1262,12 +1666,16 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_UTILS=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\Utils.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_UTILS=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\Utils.h"\
 	
 
@@ -1302,20 +1710,30 @@
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
 
 DEP_CPP_VERSE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	"..\gui\VerseTextControl.h"\
 	
+NODEP_CPP_VERSE=\
+	".\tmlctrl.h"\
+	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
 
 DEP_CPP_VERSE=\
+	"..\..\..\sword\include\defs.h"\
+	"..\..\..\sword\include\swbuf.h"\
 	"..\gui\ApplicationInterface.h"\
 	"..\gui\TextControl.h"\
 	"..\gui\Utils.h"\
 	"..\gui\VerseTextControl.h"\
 	
+NODEP_CPP_VERSE=\
+	".\tmlctrl.h"\
+	
 
 !ELSEIF  "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
 




More information about the sword-cvs mailing list