[LyX/master] Enable to build with MinGW-W64

Yuriy Skalko yuriy.skalko at gmail.com
Fri Oct 16 04:47:58 UTC 2020


commit ae5a8de6eaa0faf4b250b1ee99f7d5ac58197a0e
Author: Yuriy Skalko <yuriy.skalko at gmail.com>
Date:   Wed May 27 15:09:58 2020 +0300

    Enable to build with MinGW-W64
---
 3rdparty/zlib/1.2.11/zconf.h         |    1 +
 CMakeLists.txt                       |    2 +-
 development/cmake/LyxPackaging.cmake |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/3rdparty/zlib/1.2.11/zconf.h b/3rdparty/zlib/1.2.11/zconf.h
index 5e1d68a..4e5c99c 100644
--- 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 9085355..8553efd 100644
--- 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 2367c01..8ffeea0 100644
--- 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})


More information about the lyx-cvs mailing list