MinGW fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24346 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index fee65e9d0486bac0ea95d510ab7211635abed89d..59d142c82e5674fb6cb9daa5921e3fc13bb5bc8a 100644 (file)
--- 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="<config.h>")
        

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 8299d9fd434b2883294f053a71f3b0993897ba62..ef804a8905e76d41b07800d24fd20f90b8ef38b8 100644 (file)
--- 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 6f2ae3210a491a93e088023336effd878d9f74ec..13177b030d317a292d1238be99c8148730c5896b 100644 (file)
--- 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)