mk20dx256vlh7 working!

[kiibohd-controller.git] / Output / usbMuxUart / setup.cmake

diff --git a/Output/usbMuxUart/setup.cmake b/Output/usbMuxUart/setup.cmake
index 4d15ec23dafb648c03604b66dbdf09c0f565a54d..3ba8a32b6e7274963c674bd5c735fab59b8b4e38 100644 (file)
--- a/Output/usbMuxUart/setup.cmake
+++ b/Output/usbMuxUart/setup.cmake
@@ -1,6 +1,6 @@
 ###| CMake Kiibohd Controller Muxed UART and USB Output Module |###
 #
-# Written by Jacob Alexander in 2014 for the Kiibohd Controller
+# Written by Jacob Alexander in 2014-2015 for the Kiibohd Controller
 #
 # Released into the Public Domain
 #
@@ -8,41 +8,33 @@
 
 
 ###
-# Module C files
+# Required Submodules
 #
 
+AddModule ( Output pjrcUSB )
+AddModule ( Output uartOut )
 
-#| AVR Compiler
-if ( ${COMPILER_FAMILY} MATCHES "avr" )
-
-       set( OUTPUT_SRCS
-       )
-
-#| ARM Compiler
-elseif ( ${COMPILER_FAMILY} MATCHES "arm" )
 
-       set( OUTPUT_SRCS
-               output_com.c
-               ../pjrcUSB/arm/usb_desc.c
-               ../pjrcUSB/arm/usb_dev.c
-               ../pjrcUSB/arm/usb_keyboard.c
-               ../pjrcUSB/arm/usb_mem.c
-               ../pjrcUSB/arm/usb_serial.c
-               ../uartOut/arm/uart_serial.c
-       )
+###
+# Module C files
+#
 
-endif ()
+set( Module_SRCS
+       output_com.c
+)
 
+# Remove duplicate output_com.c files from pjrcUSB and uartOut
+list ( REMOVE_ITEM Output_SRCS
+       Output/pjrcUSB/output_com.c
+       Output/uartOut/output_com.c
+)
 
-###
-# Module Specific Options
-#
 
 ###
 # Compiler Family Compatibility
 #
-set( OutputModuleCompatibility
+set( ModuleCompatibility
        arm
-#      avr # TODO
+#       avr # TODO
 )