tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cygwin64 build. Closes issue #227

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-02-23 10:14:03 +01:00
parent 811e02bf87
commit 963072f05d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/python/recoll/setup.py.in
View File

@ -5,8 +5,13 @@ import sys
sysname = os.uname()[0] sysname = os.uname()[0]
top = os.path.join('..', '..') top = os.path.join('..', '..')
library_dirs = [os.path.join(top, 'lib')] library_dirs = [os.path.join(top, 'lib')]
libraries = ['recoll'] if "CYGWIN" in os.environ:
libraries = ['recoll', 'xapian', 'iconv', 'z']
else:
libraries = ['recoll']
if 'libdir' in os.environ and os.environ['libdir'] != "": if 'libdir' in os.environ and os.environ['libdir'] != "":
runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')] runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')]

2
src/utils/pxattr.cpp
View File

@ -29,7 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
#if defined(__gnu_linux__) || \ #if defined(__gnu_linux__) || \
(defined(__FreeBSD_kernel__)&&defined(__GLIBC__)&&!defined(__FreeBSD__)) ||\ (defined(__FreeBSD_kernel__)&&defined(__GLIBC__)&&!defined(__FreeBSD__)) ||\
defined(__CYGWIN32__) defined(__CYGWIN__)
#define PXALINUX #define PXALINUX
#endif #endif