On 03/26/2014 06:17 AM, Scott Talbert wrote: > I didn't see anything related to the installer in this most recent patch. > Did you send an older one instead?
Whoops! New patch attached... The other patch is committed, with your tweak of course. This is on top of that, and not yet committed. -- Phil Dibowitz p...@ipom.com Open Source software and tech docs Insanity Palace of Metallica http://www.phildev.net/ http://www.ipom.com/ "Be who you are and say what you feel, because those who mind don't matter and those who matter don't mind." - Dr. Seuss
commit 9496699d26fdd208f70b347e83eeab1840a81b58
Author: Phil Dibowitz <p...@ipom.com>
Date: Wed Mar 26 06:46:57 2014 -0700
Further Windows Instruction Improvements
diff --git a/concordance/INSTALL.windows b/concordance/INSTALL.windows
index 669974e..bc5ace8 100644
--- a/concordance/INSTALL.windows
+++ b/concordance/INSTALL.windows
@@ -18,11 +18,23 @@ install it to the MinGW sysroot):
To build a Win32 installer, you will need to have NSIS installed.
Additionally, you will need to set some environment variables.
+
+Assuming you were following the Fedora instructions in
+../libconcord/INSTALL.windows:
export MINGW_SYSROOT_BIN="/usr/i686-w64-mingw32/sys-root/mingw/bin"
(the path where the MinGW DLL files can be found)
+ export ZLIB_LIB_PATH="$MINGW_SYSROOT_BIN"
+ export LIBZIP_LIB_PATH="$MINGW_SYSROOT_BIN"
export HIDAPI_LIB_PATH="/path/to/hidapi/lib"
-To build the installer:
- mingw32-make win32-installer
+Or if you used the non-Fedora instructions:
+ export MINGW_SYSROOT_BIN="/usr/i686-w64-mingw32/lib"
+ (the path where the MinGW DLL files can be found)
+ export ZLIB_LIB_PATH="/tmp/root/lib"
+ export LIBZIP_LIB_PATH="/tmp/root/bin"
+ export HIDAPI_LIB_PATH="/tmp/root/bin"
+
+Then, build the installer:
+ make win32-installer
vim:textwidth=78:
diff --git a/concordance/win/concordance.nsi b/concordance/win/concordance.nsi
index 1805e31..a42cd50 100644
--- a/concordance/win/concordance.nsi
+++ b/concordance/win/concordance.nsi
@@ -38,10 +38,10 @@ Section "Concordance"
SectionIn RO
SetOutPath "$INSTDIR"
- File "$%MINGW_SYSROOT_BIN%/libgcc_s_sjlj-1.dll"
- File "$%MINGW_SYSROOT_BIN%/libstdc++-6.dll"
- File "$%MINGW_SYSROOT_BIN%/libzip-2.dll"
- File "$%MINGW_SYSROOT_BIN%/zlib1.dll"
+ #File "$%MINGW_SYSROOT_BIN%/libgcc_s_sjlj-1.dll"
+ #File "$%MINGW_SYSROOT_BIN%/libstdc++-6.dll"
+ File "$%LIBZIP_LIB_PATH%/libzip-2.dll"
+ File "$%ZLIB_LIB_PATH%/zlib1.dll"
File "$%HIDAPI_LIB_PATH%/libhidapi-0.dll"
File "../../libconcord/.libs/libconcord-3.dll"
File "../.libs/concordance.exe"
diff --git a/libconcord/INSTALL.windows b/libconcord/INSTALL.windows
index 7cd22d6..5fb4fda 100644
--- a/libconcord/INSTALL.windows
+++ b/libconcord/INSTALL.windows
@@ -17,6 +17,7 @@ For other distributions, including building on Windows directly, grab the
pre-built DLL from zlib.net. In the unzip'd directory do:
mkdir -p /tmp/buildroot/{include,lib}
cp lib/zdll.lib lib/libzdll.a # See USAGE.txt in zlib for details
+ cp zlib1.dll lib
cp -r lib/* /tmp/buildroot/lib/
cp -r include/* /tmp/buildroot/include/
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech
_______________________________________________ concordance-devel mailing list concordance-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/concordance-devel
