Enable to build with MinGW-W64

diff --git a/3rdparty/zlib/1.2.11/zconf.h b/3rdparty/zlib/1.2.11/zconf.h
index 5e1d68a004e9744cb35f9d5a2fe94fd4dbcb7f76..4e5c99cfe7f5bfaea8d4117cbdc4944687d5b99c 100644 (file)
--- a/3rdparty/zlib/1.2.11/zconf.h
+++ b/3rdparty/zlib/1.2.11/zconf.h
@@ -14,6 +14,7 @@
  * Even better than compiling with -DZ_PREFIX would be to use configure to set
  * this permanently in zconf.h using "./configure --zprefix".
  */
+#define Z_PREFIX
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90853559a82efc4eef4b400dd2ec9c247acb8d7a..8553efdf4a96f6c4b51c32b2406d4efdbfb9a1eb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -989,7 +989,7 @@ if(WIN32)
                # -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
                # does not use it and always declares the vista compatible API.
                # If this ever changes then -DPSAPI_VERSION might be needed here as well.
-               add_definitions(-DWINVER=0x0500)
+               add_definitions(-DWINVER=0x0600)
        endif()
 endif()
 

diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 2367c0172bd7cfbb3e736d4f7acb9cf497f703ba..8ffeea0c1a31fe5924456ccddcf7182b0df62fb3 100644 (file)
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -50,7 +50,7 @@ elseif(WIN32)
 
         # RKH
         # get_filename_component(MINGW_RUNTIME_PATH ${GCC_LIBGCC} PATH)
-        set(MINGW_RUNTIME_PATH "/usr/i686-w64-mingw32/sys-root/mingw/bin")
+        set(MINGW_RUNTIME_PATH "C:/Program Files/mingw64/bin")
         macro(add_runtime_dll _DLL)
             file(GLOB GCC_RUNTIME ${MINGW_RUNTIME_PATH}/${_DLL})
             list(APPEND runtime ${GCC_RUNTIME})