anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MinGW fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24346 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2008-04-19 10:17:40 +00:00
parent 1609246e19
commit eb987d20db
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/cmake/CMakeLists.txt
View File

@ -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>")

4
development/cmake/src/CMakeLists.txt
View File

@ -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)

2
development/cmake/src/tex2lyx/CMakeLists.txt
View File

@ -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)