mirror of
https://github.com/reactos/reactos.git
synced 2025-04-21 12:40:33 +00:00
[CMAKE]
* Addendum to my previous commit. svn path=/trunk/; revision=56107
This commit is contained in:
parent
9c0969d45c
commit
f97cbbbc0c
7 changed files with 61 additions and 32 deletions
|
@ -1,13 +1,24 @@
|
|||
include_directories(..)
|
||||
|
||||
add_library(cdrom_new SHARED cdrom.c data.c ioctl.c mmc.c sec.c)
|
||||
list(APPEND SOURCE
|
||||
cdrom.c
|
||||
data.c
|
||||
ioctl.c
|
||||
mmc.c
|
||||
sec.c)
|
||||
|
||||
add_library(cdrom_new SHARED ${SOURCE})
|
||||
|
||||
target_link_libraries(cdrom_new libcntpr wdmguid)
|
||||
|
||||
if(ARCH MATCHES i386)
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
add_target_compile_flags(cdrom_new "/Gz")
|
||||
#add_target_compile_flags(cdrom_new "/Gz")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
|
||||
else()
|
||||
add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
|
||||
#add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
@ -15,10 +15,12 @@ add_library(disk_new SHARED
|
|||
|
||||
target_link_libraries(disk_new libcntpr wdmguid)
|
||||
if(ARCH MATCHES i386)
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
add_target_compile_flags(disk_new "/Gz")
|
||||
#add_target_compile_flags(disk_new "/Gz")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
|
||||
else()
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
|
||||
#add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
|
||||
endif()
|
||||
|
|
|
@ -33,10 +33,12 @@ add_library(classpnp SHARED
|
|||
class.rc)
|
||||
|
||||
if(ARCH MATCHES i386)
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
add_target_compile_flags(classpnp "/Gz")
|
||||
#add_target_compile_flags(classpnp "/Gz")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
|
||||
else()
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
|
||||
#add_target_compile_flags(classpnp "-mrtd -fno-builtin -w")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -w")
|
||||
endif()
|
||||
|
|
|
@ -4,16 +4,16 @@ set_cpp()
|
|||
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||
add_definitions(-D_WIN32_WINNT=0x600)
|
||||
|
||||
include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
|
||||
|
||||
include_directories(
|
||||
${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
|
||||
|
||||
|
||||
add_library(usbehci SHARED
|
||||
list(APPEND SOURCE
|
||||
usbehci.cpp
|
||||
usb_request.cpp
|
||||
usb_queue.cpp
|
||||
hardware.cpp
|
||||
hardware.cpp)
|
||||
|
||||
add_library(usbehci SHARED
|
||||
${SOURCE}
|
||||
usbehci.rc)
|
||||
|
||||
target_link_libraries(usbehci
|
||||
|
@ -21,12 +21,15 @@ target_link_libraries(usbehci
|
|||
libcntpr
|
||||
${PSEH_LIB})
|
||||
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
#add_target_compile_flags(usbehci "/GR-")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
else()
|
||||
target_link_libraries(usbehci -lgcc)
|
||||
set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif(MSVC)
|
||||
#add_target_compile_flags(usbehci "-fno-exceptions -fno-rtti")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif()
|
||||
|
||||
set_module_type(usbehci kernelmodedriver)
|
||||
add_importlibs(usbehci ntoskrnl hal usbd)
|
||||
|
|
|
@ -4,14 +4,16 @@ set_cpp()
|
|||
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||
add_definitions(-D_WIN32_WINNT=0x600)
|
||||
|
||||
include_directories(
|
||||
${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
|
||||
include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
|
||||
|
||||
add_library(usbohci SHARED
|
||||
list(APPEND SOURCE
|
||||
usbohci.cpp
|
||||
usb_request.cpp
|
||||
usb_queue.cpp
|
||||
hardware.cpp
|
||||
hardware.cpp)
|
||||
|
||||
add_library(usbohci SHARED
|
||||
${SOURCE}
|
||||
usbohci.rc)
|
||||
|
||||
target_link_libraries(usbohci
|
||||
|
@ -19,12 +21,15 @@ target_link_libraries(usbohci
|
|||
libcntpr
|
||||
${PSEH_LIB})
|
||||
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
set_target_properties(usbohci PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
#add_target_compile_flags(usbohci "/GR-")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
else()
|
||||
target_link_libraries(usbohci -lgcc)
|
||||
set_target_properties(usbohci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif(MSVC)
|
||||
#add_target_compile_flags(usbohci "-fno-exceptions -fno-rtti")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif()
|
||||
|
||||
set_module_type(usbohci kernelmodedriver)
|
||||
add_importlibs(usbohci ntoskrnl hal usbd)
|
||||
|
|
|
@ -7,11 +7,14 @@ add_definitions(-D_WIN32_WINNT=0x600)
|
|||
include_directories(
|
||||
${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
|
||||
|
||||
add_library(usbuhci SHARED
|
||||
list(APPEND SOURCE
|
||||
usbuhci.cpp
|
||||
usb_request.cpp
|
||||
usb_queue.cpp
|
||||
hardware.cpp
|
||||
hardware.cpp)
|
||||
|
||||
add_library(usbuhci SHARED
|
||||
${SOURCE}
|
||||
usbuhci.rc)
|
||||
|
||||
target_link_libraries(usbuhci
|
||||
|
@ -19,12 +22,15 @@ target_link_libraries(usbuhci
|
|||
libcntpr
|
||||
${PSEH_LIB})
|
||||
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
set_target_properties(usbuhci PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
#add_target_compile_flags(usbuhci "/GR-")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
else()
|
||||
target_link_libraries(usbuhci -lgcc)
|
||||
set_target_properties(usbuhci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif(MSVC)
|
||||
#add_target_compile_flags(usbuhci "-fno-exceptions -fno-rtti")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif()
|
||||
|
||||
set_module_type(usbuhci kernelmodedriver)
|
||||
add_importlibs(usbuhci ntoskrnl hal usbd)
|
||||
|
|
|
@ -58,10 +58,11 @@ target_link_libraries(portcls
|
|||
libcntpr
|
||||
${PSEH_LIB})
|
||||
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
if(MSVC)
|
||||
add_target_compile_flags(portcls "/GR-")
|
||||
#add_target_compile_flags(portcls "/GR-")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
|
||||
else()
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
#add_target_compile_flags(portcls "-fno-exceptions -fno-rtti")
|
||||
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
|
||||
endif()
|
||||
|
@ -70,4 +71,3 @@ set_module_type(portcls kernelmodedriver ENTRYPOINT 0 )
|
|||
add_pch(portcls private.hpp)
|
||||
add_importlibs(portcls ntoskrnl ks drmk hal)
|
||||
add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all)
|
||||
|
||||
|
|
Loading…
Reference in a new issue