Small 1.28 adjustments for Windows build

src/common/autoconfig-win.h

@@ -121,7 +121,7 @@
 #define PACKAGE_NAME "Recoll"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Recoll 1.28.0"
+#define PACKAGE_STRING "Recoll 1.28.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "recoll"
@@ -130,7 +130,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.28.0"
+#define PACKAGE_VERSION "1.28.3"
 
 /* putenv parameter is const */
 /* #undef PUTENV_ARG_CONST */

src/python/recoll/setup-win.py

@@ -25,37 +25,37 @@ include_dirs = [
         os.path.join(top, 'query'), 
         os.path.join(top, 'internfile'), 
 ]
+
 define_macros = [
         ('RECOLL_DATADIR', RECOLL_DATADIR),
         ('__WIN32__', '1')
 ]
+
 library_dirs = [
-        os.path.join(top, "windows", "build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release"),
+        os.path.join(top, "windows", "build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release"),
         os.path.join(recolldeps, "libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc"),
         os.path.join(recolldeps, "libxslt/libxslt-1.1.29/win32/bin.msvc"),
-        os.path.join(top, "windows", "build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release"),
+        os.path.join(top, "windows", "build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release"),
         os.path.join(recolldeps, "zlib-1.2.11"),
-        os.path.join(recolldeps, "build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release")
+        os.path.join(recolldeps, "build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release")
         ]
+
 libraries =  ["librecoll", "libxml2_a", "libxslt_a",
               "libxapian", "libiconv", "zlib",
               "rpcrt4", "ws2_32", "shlwapi", "shell32",
               "psapi", "user32", "kernel32"
 ]
-module1 = Extension('recoll',
-                    define_macros = define_macros,
-                    include_dirs = include_dirs,
-                    libraries = libraries,
-                    library_dirs = library_dirs,
-                    sources = [os.path.join(pytop, 'pyrecoll.cpp')])
 
-module2 = Extension('rclextract',
+extra_compile_args = ['-std=c++11']
+
+module1 = Extension('_recoll',
                     define_macros = define_macros,
                     include_dirs = include_dirs,
-                    extra_compile_args = extra_compile_args,
                     libraries = libraries,
                     library_dirs = library_dirs,
-                    sources = [os.path.join(pytop, 'pyrclextract.cpp')])
+                    sources = [os.path.join(pytop, 'pyrecoll.cpp'),
+                               os.path.join(pytop, 'pyresultstore.cpp'),
+                               os.path.join(pytop, 'pyrclextract.cpp')])
 
 setup (name = 'Recoll',
        version = VERSION,
@@ -69,4 +69,4 @@ setup (name = 'Recoll',
 ''',
     packages = ['recoll'],
     ext_package = 'recoll',
-       ext_modules = [module1, module2])
+       ext_modules = [module1])

src/qtgui/recoll-win.pro

@@ -63,6 +63,7 @@ SOURCES += \
         rclhelp.cpp \
         rclmain_w.cpp \
         rclm_idx.cpp \
+        rclm_menus.cpp \
         rclm_preview.cpp \
         rclm_saveload.cpp \
         rclm_view.cpp \

src/query/qresultstore.cpp

@@ -25,8 +25,6 @@
 #include <map>
 #include <vector>
 
-#include <malloc.h>
-#include <unistd.h>
 #include <string.h>
 
 #include "rcldoc.h"

src/utils/smallut.cpp

@@ -37,6 +37,8 @@
 #ifdef _WIN32
 // needed for localtime_r under mingw?
 #define _POSIX_THREAD_SAFE_FUNCTIONS
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
 #ifdef _MSC_VER
 #define localtime_r(a,b) localtime_s(b,a)
 #endif /* _MSC_VER */

src/windows/qmkrecoll/librecoll.pro

@@ -65,6 +65,7 @@ SOURCES += \
 ../../query/dynconf.cpp \
 ../../query/filtseq.cpp \
 ../../query/plaintorich.cpp \
+../../query/qresultstore.cpp \
 ../../query/recollq.cpp \
 ../../query/reslistpager.cpp \
 ../../query/sortseq.cpp \