From ad197b69da25d5645259c2f4fce9714f1e28fd68 Mon Sep 17 00:00:00 2001
From: Michael Curran <mick@kulgan.net>
Date: Tue, 15 Jun 2010 14:23:44 +1000
Subject: [PATCH] nvdaControllerClient distribution: move example_python.py and
 example_c.c in to the x86 subdirectory, and note in readme.html that  the
 libraries and headers are now separated in to x86 and x64 directories, and
 that the two example files are in x86.

---
 extras/controllerClient/readme.html                 | 16 +++++++++++++---
 extras/controllerClient/{ => x86}/example_c.c       |  0
 extras/controllerClient/{ => x86}/example_python.py |  0
 3 files changed, 13 insertions(+), 3 deletions(-)
 rename extras/controllerClient/{ => x86}/example_c.c (100%)
 rename extras/controllerClient/{ => x86}/example_python.py (100%)

diff --git a/extras/controllerClient/readme.html b/extras/controllerClient/readme.html
index a9b52d2cc..0a1665e48 100644
--- a/extras/controllerClient/readme.html
+++ b/extras/controllerClient/readme.html
@@ -15,11 +15,21 @@ The client API is implemented as a dll (dynamic link library). The functions in
 <p>
 Note: The header and library files are built along with nvdaHelper. If you want to build them yourself, please see source\nvdaHelper\building.txt in the NVDA source distribution for instructions. Alternatively, you can find a pre-built package at <a href="http://www.nvda-project.org/nvdaControllerClient/">http://www.nvda-project.org/nvdaControllerClient/</a>.
 </p>
+<p>
+Versions of the libraries and headers are supplied for both x86 and x64 applications. Therefore they have been split in to x86 and x64 directories respectivly.
+</p>
+<p>
+Each directory contains the following files [Where * denotes 32 for x86 and 64 for x64]:
+</p> 
 <ul>
-<li>nvdaControllerClient32.dll: the dll that contains all the functions. This is for use in 32 bit applications. You can distribute this dll with your application.</li>
-<li>nvdaControllerClient32.lib and nvdaControllerClient32.exp: The import and export libraries for nvdaControllerClient32.dll (used when linking with C/C++ code).</li>
-<li>nvdaControllerClient64.dll, nvdaControllerClient64.lib and nvdaControllerClient64.exp: same as above except for use in 64 bit applications.</li>
+<li>nvdaControllerClient*.dll: the dll that contains all the functions. You can distribute this dll with your application.</li>
+<li>nvdaControllerClient*.lib and nvdaControllerClient*.exp: The import and export libraries for nvdaControllerClient*.dll (used when linking with C/C++ code).</li>
 <li>nvdaController.h: a C header file containing declarations for all the provided functions.</li>
+</ul>
+<p>
+The x86 directory also contains two example files:
+</p>
+<ul>
 <li>example_python.py: an example Python program that uses the NVDA controller client API.</li>
 <li>example_c.c: The source code for an example C program that uses the NVDA controller client API.</li>
 </ul>
diff --git a/extras/controllerClient/example_c.c b/extras/controllerClient/x86/example_c.c
similarity index 100%
rename from extras/controllerClient/example_c.c
rename to extras/controllerClient/x86/example_c.c
diff --git a/extras/controllerClient/example_python.py b/extras/controllerClient/x86/example_python.py
similarity index 100%
rename from extras/controllerClient/example_python.py
rename to extras/controllerClient/x86/example_python.py
-- 
2.11.0