[ros-diffs] [akhaldi] 56248: [FBTUSB] * Properly add fbtusb. This fixes both gcc and msvc builds.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Tue Mar 27 16:36:54 UTC 2012


Author: akhaldi
Date: Tue Mar 27 16:36:53 2012
New Revision: 56248

URL: http://svn.reactos.org/svn/reactos?rev=56248&view=rev
Log:
[FBTUSB]
* Properly add fbtusb. This fixes both gcc and msvc builds.

Modified:
    trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt

Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt?rev=56248&r1=56247&r2=56248&view=diff
==============================================================================
--- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Tue Mar 27 16:36:53 2012
@@ -1,18 +1,27 @@
 
-include_directories(
-    BEFORE include
-    include)
+include_directories(include)
 
-add_library(fbtusb SHARED
+list(APPEND SOURCE
     fbtdev.c
     fbtpnp.c
     fbtpwr.c
     fbtrwr.c
-    fbtusb.c
 #   fbtwmi.c
+    fbtusb.c)
+
+add_library(fbtusb SHARED
+    ${SOURCE}
     fbtusb.rc)
 
-allow_warnings(fbtusb)
+# FIXME: http://www.cmake.org/Bug/view.php?id=12998
+if(MSVC)
+    #add_target_compile_flags(fbtusb "/Gz")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
+else()
+    #allow_warnings(fbtusb)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -mrtd -fno-builtin")
+endif()
+
 set_module_type(fbtusb kernelmodedriver)
 add_importlibs(fbtusb ntoskrnl hal usbd)
 add_cd_file(TARGET fbtusb DESTINATION reactos/system32/drivers FOR all)




More information about the Ros-diffs mailing list