anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-21 17:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make LyX compiled by MSVC 2015 run on Vista again

Browse Source 
Patch and tests from Dima Ruinskiy, comments by me. For details see discussion
in bug 10186.
This commit is contained in:
Georg Baum 2016-07-02 10:16:48 +02:00
parent b608174e9a
commit 67d7a17af5
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -766,10 +766,14 @@ if(WIN32)
set(WIN32_CONSOLE WIN32) set(WIN32_CONSOLE WIN32)
endif() endif()
if(MSVC) if(MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX) # -DPSAPI_VERSION=1 is needed to run on vista (bug 10186)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX -DPSAPI_VERSION=1)
# disable checked iterators for msvc release builds to get maximum speed # disable checked iterators for msvc release builds to get maximum speed
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
else() else()
# -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=0x0500)
endif() endif()
endif() endif()

3
lib/CREDITS
View File

@ -468,6 +468,9 @@
@bPaul A. Rubin @bPaul A. Rubin
@iE-mail: rubin () msu ! edu @iE-mail: rubin () msu ! edu
Major rework of the AMS classes Major rework of the AMS classes
@bDima Ruinskiy
@iE-mail: dima.ruinskiy () outlook ! com
Reintroduction of Windows Vista support (bug 10186)
@bGuy Rutenberg @bGuy Rutenberg
@iE-mail: guyrutenberg () gmail ! com @iE-mail: guyrutenberg () gmail ! com
System call fixes System call fixes

8
lib/generate_contributions.py
View File

@ -1571,6 +1571,14 @@ contributors = [
"25 September 2007", "25 September 2007",
u"Major rework of the AMS classes"), u"Major rework of the AMS classes"),
contributor(u"Dima Ruinskiy",
"dima.ruinskiy () outlook ! com",
"GPL",
"Joining LyX development team",
"m=146687842921797",
"24 June 2016",
u"Reintroduction of Windows Vista support (bug 10186)"),
contributor(u"Guy Rutenberg", contributor(u"Guy Rutenberg",
"guyrutenberg () gmail ! com", "guyrutenberg () gmail ! com",
"GPL", "GPL",

3
status.22x
View File

@ -198,3 +198,6 @@ What's new
- Fix monolithic builds with autotools on Mac OS X. - Fix monolithic builds with autotools on Mac OS X.
- Avoid 'ar' warning with recent binutils versions. - Avoid 'ar' warning with recent binutils versions.
- LyX compiled with Microsoft Visual Studio 2015 runs now on Windows Vista (bug 10186)