X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FuartOut%2Fsetup.cmake;h=d411b87764508c0079911c30f084fa704e27c64f;hb=5f262ea4b68a07e9b94ce0a49c0f7196e5f32b3b;hp=66eec96cf77b27e75523d56e239e53d0ec80db05;hpb=6f563bdc9f5834e913d85e2e8af6297ef4b6e117;p=kiibohd-controller.git

diff --git a/Output/uartOut/setup.cmake b/Output/uartOut/setup.cmake
index 66eec96..d411b87 100644
--- a/Output/uartOut/setup.cmake
+++ b/Output/uartOut/setup.cmake
@@ -1,6 +1,6 @@
 ###| CMake Kiibohd Controller UART 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
 #
@@ -11,11 +11,10 @@
 # Module C files
 #
 
-
 #| AVR Compiler
 if ( ${COMPILER_FAMILY} MATCHES "avr" )
 
-	set( OUTPUT_SRCS
+	set ( Module_SRCS
 		output_com.c
 		avr/uart_serial.c
 	)
@@ -23,7 +22,7 @@ if ( ${COMPILER_FAMILY} MATCHES "avr" )
 #| ARM Compiler
 elseif ( ${COMPILER_FAMILY} MATCHES "arm" )
 
-	set( OUTPUT_SRCS
+	set ( Module_SRCS
 		output_com.c
 		arm/uart_serial.c
 	)
@@ -32,13 +31,19 @@ endif ()
 
 
 ###
-# Module Specific Options
+# Includes
 #
 
+# Use pjrcUSB output_com.h
+include_directories (
+	${CMAKE_CURRENT_LIST_DIR}/../pjrcUSB
+)
+
+
 ###
 # Compiler Family Compatibility
 #
-set( OutputModuleCompatibility
+set( ModuleCompatibility
 	arm
 #	avr # TODO
 )