commit e3bf51a4c318bd01a0e38c037a6db091d1ddbd87
Author: Yuriy Skalko <[email protected]>
Date: Fri Oct 16 08:17:12 2020 +0300
Revert "Enable to build with MinGW-W64"
This reverts commit ae5a8de6eaa0faf4b250b1ee99f7d5ac58197a0e.
---
3rdparty/zlib/1.2.11/zconf.h | 1 -
CMakeLists.txt | 2 +-
development/cmake/LyxPackaging.cmake | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/3rdparty/zlib/1.2.11/zconf.h b/3rdparty/zlib/1.2.11/zconf.h
index 4e5c99c..5e1d68a 100644
--- a/3rdparty/zlib/1.2.11/zconf.h
+++ b/3rdparty/zlib/1.2.11/zconf.h
@@ -14,7 +14,6 @@
* 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 8553efd..9085355 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=0x0600)
+ add_definitions(-DWINVER=0x0500)
endif()
endif()
diff --git a/development/cmake/LyxPackaging.cmake
b/development/cmake/LyxPackaging.cmake
index 8ffeea0..2367c01 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 "C:/Program Files/mingw64/bin")
+ set(MINGW_RUNTIME_PATH "/usr/i686-w64-mingw32/sys-root/mingw/bin")
macro(add_runtime_dll _DLL)
file(GLOB GCC_RUNTIME ${MINGW_RUNTIME_PATH}/${_DLL})
list(APPEND runtime ${GCC_RUNTIME})
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
