From b1ce2da8a0ca94bb890f5227a1df98c3ecaa75a0 Mon Sep 17 00:00:00 2001
From: Kolja Waschk <urjtag@ixo.de>
Date: Thu, 16 Apr 2009 20:33:48 +0000
Subject: [PATCH] Include inpout32.dll in UrJTAG.exe installer, mention source
 for x64/vista inpout32.dll, trick for DATA_PATH

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1496 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog      |  2 ++
 jtag/UrJTAG.nsi     | 23 ++++++++++++++++++-----
 jtag/doc/UrJTAG.txt |  3 +++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 48d5aaef..7ccb31ea 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -5,6 +5,8 @@
 2009-04-16  Kolja Waschk <kawk>
 
   * include/xpcu.h, src/flash/jedec_exp.c: Add license info
+  * doc/UrJTAG.txt: Info about source for 64bit/Vista inpout32.dll
+  * UrJTAG.nsi: Include inpout32.dll (needs some manual work)
 
 2009-04-16  Arnim  <arniml>
 
diff --git a/jtag/UrJTAG.nsi b/jtag/UrJTAG.nsi
index 29aee4f8..a209021c 100644
--- a/jtag/UrJTAG.nsi
+++ b/jtag/UrJTAG.nsi
@@ -1,5 +1,5 @@
 ;
-; $Id: UrJTAG.nsi 1205 2008-05-06 15:35:49Z kawk $
+; $Id$
 ;
 ; Script to create Installer for Windows platforms using 
 ;   "nullsoft scriptable install system" (NSIS)
@@ -31,11 +31,23 @@
 ; extracted from a distributed archive of UrJTAG (make dist)
 ; after configuring and compiling. Usually you want to compile
 ; with --with-ftd2xx, --with-inpout32, --enable-relocatable and
-; the CFLAGS=-mno-cygwin setting.
+; the CFLAGS=-mno-cygwin setting. To make UrJTAG search for
+; its data files and BSDL declarations in the correct path,
+; add JTAG_BIN_DIR and JTAG_DATA_DIR as follows to the CFLAGS
+; (this is used for building the UrJTAG.exe distributable):
+;
+;  CFLAGS="-mno-cygwin -O2 -DJTAG_BIN_DIR=\\\"/\\\" -DJTAG_DATA_DIR=\\\"/data\\\""
+;  ./configure --with-ftd2xx=/cygdrive/e/ftd2xx --with-inpout32 --enable-relocatable
+;
+; This script now expects InpOut32.dll in the current directory
+; as well. You can get an InpOut32.dll that works on 32 bit AND
+; 64 bit Windows, including Vista, from 
+;     http://www.highrez.co.uk/Downloads/InpOut32/
+;
+; No drivers for FTDI cables are installed. FTD2XX.DLL must be
+; in your PATH somewhere. It usually is installed with the cable
+; drivers.
 ;
-; TODO: Install DLLs for cables (InpOut32.DLL, FTD2XX.DLL etc.)
-
-
 ;--------------------------------
 ;Include Modern UI
 
@@ -85,6 +97,7 @@ Section "UrJTAG executable" SecExe
 
   SetOutPath "$INSTDIR"
   File src\jtag.exe
+  File inpout32.dll
   WriteRegStr HKCU "Software\UrJTAG" "" $INSTDIR
   WriteUninstaller "$INSTDIR\uninst.exe"
 
diff --git a/jtag/doc/UrJTAG.txt b/jtag/doc/UrJTAG.txt
index f3f27b5f..322dc283 100644
--- a/jtag/doc/UrJTAG.txt
+++ b/jtag/doc/UrJTAG.txt
@@ -439,6 +439,9 @@ library is available from logix4u.net:
 
   http://logix4u.net/Legacy_Ports/Parallel_Port/Inpout32.dll_for_Windows_98/2000/NT/XP.html
 
+An version updated to work in Windows Vista and 64 bit Windows is available from highrez:
+
+  http://www.highrez.co.uk/Downloads/InpOut32/
 
 ==== Driver tailoring ====