mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 16:32:59 +00:00
[FREELDR]
Don't use fancy CMake features for MSVC builds that would require custom CMake installations. Period. ;-) svn path=/trunk/; revision=57015
This commit is contained in:
parent
5437fdfa9b
commit
f91d4d599c
1 changed files with 5 additions and 5 deletions
|
@ -150,7 +150,7 @@ else()
|
||||||
#TBD
|
#TBD
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_GREATER 2.8.7)
|
if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7)
|
||||||
add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE})
|
add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE})
|
||||||
else()
|
else()
|
||||||
add_library(freeldr_common ${FREELDR_COMMON_SOURCE})
|
add_library(freeldr_common ${FREELDR_COMMON_SOURCE})
|
||||||
|
@ -171,7 +171,7 @@ if(NOT MSVC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_GREATER 2.8.7)
|
if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7)
|
||||||
add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
|
add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
|
||||||
add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
|
add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
|
||||||
else()
|
else()
|
||||||
|
@ -200,7 +200,7 @@ if(ARCH MATCHES i386)
|
||||||
target_link_libraries(freeldr_pe_dbg mini_hal)
|
target_link_libraries(freeldr_pe_dbg mini_hal)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7)
|
if(MSVC OR NOT CMAKE_VERSION VERSION_GREATER 2.8.7)
|
||||||
target_link_libraries(freeldr_pe freeldr_common)
|
target_link_libraries(freeldr_pe freeldr_common)
|
||||||
target_link_libraries(freeldr_pe_dbg freeldr_common)
|
target_link_libraries(freeldr_pe_dbg freeldr_common)
|
||||||
endif()
|
endif()
|
||||||
|
@ -231,7 +231,7 @@ if(ARCH MATCHES i386 OR ARCH MATCHES amd64)
|
||||||
list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
|
list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_GREATER 2.8.7)
|
if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7)
|
||||||
add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
|
add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
|
||||||
add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
|
add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
|
||||||
else()
|
else()
|
||||||
|
@ -263,7 +263,7 @@ if(ARCH MATCHES i386)
|
||||||
target_link_libraries(setupldr_pe_dbg mini_hal)
|
target_link_libraries(setupldr_pe_dbg mini_hal)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7)
|
if(MSVC OR NOT CMAKE_VERSION VERSION_GREATER 2.8.7)
|
||||||
target_link_libraries(setupldr_pe freeldr_common)
|
target_link_libraries(setupldr_pe freeldr_common)
|
||||||
target_link_libraries(setupldr_pe_dbg freeldr_common)
|
target_link_libraries(setupldr_pe_dbg freeldr_common)
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue