X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FpjrcUSB%2Fsetup.cmake;h=7e7a874ab8cb2c83091fbde5848b9182bd6f7510;hb=20b62afb9a05a64b1f15c6329866600913775eea;hp=d982976a4687157e51b9284e0a496221b8b4bfe1;hpb=15ec4ff71c1f92ce2e20302195a91e0c8390ad8a;p=kiibohd-controller.git

diff --git a/Output/pjrcUSB/setup.cmake b/Output/pjrcUSB/setup.cmake
index d982976..7e7a874 100644
--- a/Output/pjrcUSB/setup.cmake
+++ b/Output/pjrcUSB/setup.cmake
@@ -1,6 +1,6 @@
 ###| CMake Kiibohd Controller USB Module |###
 #
-# Written by Jacob Alexander in 2011-2013 for the Kiibohd Controller
+# Written by Jacob Alexander in 2011-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/usb_keyboard_serial.c
 	)
@@ -23,26 +22,24 @@ if ( ${COMPILER_FAMILY} MATCHES "avr" )
 #| ARM Compiler
 elseif ( ${COMPILER_FAMILY} MATCHES "arm" )
 
-	set( OUTPUT_SRCS
+	set ( Module_SRCS
 		output_com.c
 		arm/usb_desc.c
 		arm/usb_dev.c
+		arm/usb_joystick.c
 		arm/usb_keyboard.c
 		arm/usb_mem.c
+		arm/usb_mouse.c
 		arm/usb_serial.c
 	)
 
 endif ( ${COMPILER_FAMILY} MATCHES "avr" )
 
 
-###
-# Module Specific Options
-#
-
 ###
 # Compiler Family Compatibility
 #
-set( OutputModuleCompatibility
+set( ModuleCompatibility
 	arm
 	avr
 )