Merged the changes from the current windows port

Jean-Francois Dockes Jean-Francois Dockes 2015-09-25

<< < 1 .. 5 6 7 (Page 7 of 7)
changed src/utils/utf8iter.cpp
changed src/configure.ac
changed website/features.html
copied src/filters/rclnull -> src/windows/targetver.h
copied src/sampleconf/recoll.conf.in -> src/sampleconf/recoll.conf
src/utils/utf8iter.cpp Diff Switch to side-by-side view
Loading...
src/configure.ac Diff Switch to side-by-side view
Loading...
website/features.html Diff Switch to side-by-side view
Loading...
src/filters/rclnull to src/windows/targetver.h
--- a/src/filters/rclnull
+++ b/src/windows/targetver.h
@@ -1,9 +1,8 @@
-#!/bin/sh
-# It may make sense in some cases to set this null filter (no output)
-# instead of using recoll_noindex or leaving the default filter in
-# case one doesn't want to install it: this will avoid endless retries
-# to reindex the affected files, as recoll will think it has succeeded
-# indexing them. Downside: the files won't be indexed when one
-# actually installs the real filter, will need a -z
-
-exit 0
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>
src/sampleconf/recoll.conf.in to src/sampleconf/recoll.conf
--- a/src/sampleconf/recoll.conf.in
+++ b/src/sampleconf/recoll.conf
@@ -1,7 +1,7 @@
 # (C) 2004 J.F.Dockes. License: GPL
 #
 # Recoll default configuration file. This typically lives in
-# @prefix@/share/recoll/examples and provides default values. You can
+# $prefix/share/recoll/examples and provides default values. You can
 # override selected parameters by adding assigments to
 # ~/.recoll/recoll.conf (or $RECOLL_CONFDIR/recoll.conf)
 #
@@ -199,12 +199,13 @@
 idxflushmb = 10
 
 # Place to search for executable filters. If RECOLL_FILTERSDIR is set in
-# the environment, we use it instead
-filtersdir = @prefix@/share/recoll/filters
+# the environment, we use it instead. Defaults to $prefix/share/recoll/filters
+# filtersdir = /path/to/my/filters
 
 # Place to search for icons. The only reason to change this would be if you
-# want to change the icons displayed in the result list
-iconsdir = @prefix@/share/recoll/images
+# want to change the icons displayed in the result list.
+# Defaults to $prefix/share/recoll/images
+# iconsdir = /path/to/my/icons
 
 # Should we use the system's 'file -i' command as a final step in file type
 # identification ? This may be useful, but will usually cause the
<< < 1 .. 5 6 7 (Page 7 of 7)