From eb987d20dbaefdf32bcd67382160aae0a74e3284 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sat, 19 Apr 2008 10:17:40 +0000 Subject: [PATCH] MinGW fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24346 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 12 +++++++----- development/cmake/src/CMakeLists.txt | 4 ++++ development/cmake/src/tex2lyx/CMakeLists.txt | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index fee65e9d04..59d142c82e 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -158,6 +158,13 @@ if(WIN32) else() message("----- Console enabled, disable it with -Dnoconsole=1") endif() + if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX) + # disable checked iterators for msvc release builds to get maximum speed + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0") + else() + add_definitions(-DWINVER=0x0500) + endif() endif() set(PROGRAM_SUFFIX "\"\"") @@ -172,11 +179,6 @@ message("----- LYX_ABS_INSTALLED_DATADIR : ${LYX_ABS_INSTALLED_DATADIR}") message("----- LYX_ABS_INSTALLED_LOCALEDIR : ${LYX_ABS_INSTALLED_LOCALEDIR}") message("") -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX) - # disable checked iterators for msvc release builds to get maximum speed - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0") -endif() add_definitions(-DBOOST_USER_CONFIG="") diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index 8299d9fd43..ef804a8905 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -78,6 +78,10 @@ if(APPLE) target_link_libraries(lyx "-framework Carbon" ) endif() +if(MINGW) + target_link_libraries(lyx ole32) +endif() + project_source_group("${GROUP_CODE}" lyx_sources lyx_headers) install(TARGETS lyx DESTINATION bin) diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt index 6f2ae3210a..13177b030d 100644 --- a/development/cmake/src/tex2lyx/CMakeLists.txt +++ b/development/cmake/src/tex2lyx/CMakeLists.txt @@ -63,7 +63,7 @@ target_link_libraries(tex2lyx ${ICONV_LIBRARY}) if(WIN32) - target_link_libraries(tex2lyx shlwapi) + target_link_libraries(tex2lyx shlwapi ole32) endif() if(APPLE) -- 2.39.2