mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-24 18:43:37 +00:00
Revert "Enable to build with MinGW-W64"
This reverts commit ae5a8de6ea
.
This commit is contained in:
parent
3ff79bccae
commit
e3bf51a4c3
1
3rdparty/zlib/1.2.11/zconf.h
vendored
1
3rdparty/zlib/1.2.11/zconf.h
vendored
@ -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
|
||||
|
||||
|
@ -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()
|
||||
|
||||
|
@ -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})
|
||||
|
Loading…
Reference in New Issue
Block a user