Merge pull request #71 from glguy/pr-cli-history

[kiibohd-controller.git] / LoadFile / CMakeLists.txt

diff --git a/LoadFile/CMakeLists.txt b/LoadFile/CMakeLists.txt
index a2f252bacf228e2cad3a88f92d294c00f536339b..7b5ace25d33afd8b7e05b0859b3ac73ce89d1e47 100644 (file)
--- a/LoadFile/CMakeLists.txt
+++ b/LoadFile/CMakeLists.txt
@@ -45,10 +45,10 @@ set( SRCS
 #
 list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ) # Use local find scripts
 
-#| Linux - libusb
-if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+#| Linux/Windows - libusb
+if( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "CYGWIN" )
        # Find libusb (not 1.0)
-       find_package( LibUSB REQUIRED )
+       find_package( LibUSB-1.0 REQUIRED )
 
        # Defines
        set( DEFINES -s -DUSE_LIBUSB )
@@ -59,29 +59,22 @@ if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
        # Libraries
        set( LIBS ${LIBUSB_LIBRARIES} )
 
-#| Windows
-elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
-       message( AUTHOR_WARNING "Not Tested...")
-
-       # Defines
-       set( DEFINES -s -DUSE_WIN32 )
-
-       # Libraries
-       set( LIBS hid setupapi )
-
 #| Mac OS X
-elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
        message( AUTHOR_WARNING "Not Tested...")
 
        # Defines - XXX What is SDK?
        set( DEFINES -DUSE_APPLE_IOKIT -isysroot ${SDK} -Wl,-syslibroot,${SDK} -framework IOKit -framework CoreFoundation )
 
 #| BSD - NetBSD and OpenBSD
-elseif( ${CMAKE_SYSTEM_NAME} MATCHES "BSD" )
+elseif( CMAKE_SYSTEM_NAME MATCHES "BSD" )
        message( AUTHOR_WARNING "Not Tested...")
 
        # Defines
        set( DEFINES -s -DUSE_UHID )
+#| Unregonized OS
+else()
+       message( FATAL_ERROR "${CMAKE_SYSTEM_NAME}: OS Not Recognized..." )
 endif()
 
 
@@ -91,7 +84,7 @@ endif()
 #
 
 #| Default CFLAGS
-set( CFLAGS -O2 -Wall )
+set( CFLAGS -O2 -Wall -std=gnu99 )
 
 add_definitions( ${CFLAGS} ${DEFINES} )