aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-08-14 19:18:16 +0200
committerDean Camera <dean@fourwalledcubicle.com>2013-08-14 19:18:16 +0200
commitde366fdbe1d7cdb1a46404627492bee678595ba1 (patch)
tree1c56db0a54df0128615a171d51718cac9ad83278
parent82e606eb3b90a9d5c4ca72f2894d2a725ee8c3de (diff)
downloadlufa-de366fdbe1d7cdb1a46404627492bee678595ba1.tar.gz
lufa-de366fdbe1d7cdb1a46404627492bee678595ba1.tar.bz2
lufa-de366fdbe1d7cdb1a46404627492bee678595ba1.zip
Add host application directories as distributables in Atmel Studio.
-rw-r--r--Bootloaders/HID/asf.xml2
-rw-r--r--Demos/Device/ClassDriver/GenericHID/asf.xml3
-rw-r--r--Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml1
-rw-r--r--LUFA/StudioIntegration/makefile2
-rw-r--r--Projects/LEDNotifier/asf.xml2
-rw-r--r--Projects/TempDataLogger/asf.xml3
6 files changed, 12 insertions, 1 deletions
diff --git a/Bootloaders/HID/asf.xml b/Bootloaders/HID/asf.xml
index 91fb35ebf..d43a3582f 100644
--- a/Bootloaders/HID/asf.xml
+++ b/Bootloaders/HID/asf.xml
@@ -110,6 +110,8 @@
<build type="header-file" value="Config/LUFAConfig.h"/>
<build type="distribute" subtype="user-file" value="BootloaderHID.txt"/>
+ <build type="distribute" subtype="directory" value="HostLoaderApp"/>
+ <build type="distribute" subtype="directory" value="HostLoaderApp_Python"/>
<require idref="lufa.common"/>
<require idref="lufa.platform"/>
diff --git a/Demos/Device/ClassDriver/GenericHID/asf.xml b/Demos/Device/ClassDriver/GenericHID/asf.xml
index 1f03490e5..513410b76 100644
--- a/Demos/Device/ClassDriver/GenericHID/asf.xml
+++ b/Demos/Device/ClassDriver/GenericHID/asf.xml
@@ -40,6 +40,9 @@
<device-support-alias value="lufa_xmega"/>
<device-support-alias value="lufa_uc3"/>
+ <build type="distribute" subtype="user-file" value="GenericHID.txt"/>
+ <build type="distribute" subtype="directory" value="HostTestApp"/>
+
<build type="c-source" value="GenericHID.c"/>
<build type="c-source" value="Descriptors.c"/>
<build type="header-file" value="GenericHID.h"/>
diff --git a/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml b/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
index 4ddffc26b..57a7cef50 100644
--- a/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
+++ b/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
@@ -29,6 +29,7 @@
<device-support-alias value="lufa_uc3"/>
<build type="distribute" subtype="user-file" value="AndroidAccessoryHost.txt"/>
+ <build type="distribute" subtype="directory" value="AndroidHostApp"/>
<build type="c-source" value="AndroidAccessoryHost.c"/>
<build type="header-file" value="AndroidAccessoryHost.h"/>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 8f41a24c0..5a3f7933a 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -124,7 +124,7 @@ check_filenames: $(MODULE_OUTPUT_XML)
echo "Checking $$f..."; \
asf_file_dir=`dirname $$f`; \
xsltproc XDK/lufa_filelist_transform.xslt $$f | sed -e "/^$$/d" | while read -r i; do \
- if ( ! test -f "$$asf_file_dir/$$i" ); then \
+ if ( ( ! test -f "$$asf_file_dir/$$i" ) && ( ! test -d "$$asf_file_dir/$$i" ) ); then \
echo "Source file \"$$i\" referenced in $$f does not exist!"; \
exit 1; \
fi; \
diff --git a/Projects/LEDNotifier/asf.xml b/Projects/LEDNotifier/asf.xml
index 81828ea33..fb2edb103 100644
--- a/Projects/LEDNotifier/asf.xml
+++ b/Projects/LEDNotifier/asf.xml
@@ -30,6 +30,8 @@
<build type="distribute" subtype="user-file" value="LEDNotifier.txt"/>
<build type="distribute" subtype="user-file" value="LUFA LED Notifier.inf"/>
+ <build type="distribute" subtype="directory" value="CPUUsageApp"/>
+ <build type="distribute" subtype="directory" value="LEDMixerApp"/>
<build type="c-source" value="LEDNotifier.c"/>
<build type="c-source" value="Descriptors.c"/>
diff --git a/Projects/TempDataLogger/asf.xml b/Projects/TempDataLogger/asf.xml
index 93ae7cf14..493945809 100644
--- a/Projects/TempDataLogger/asf.xml
+++ b/Projects/TempDataLogger/asf.xml
@@ -30,6 +30,8 @@
<device-support-alias value="lufa_uc3"/>
<build type="distribute" subtype="user-file" value="TemperatureDataLogger.txt"/>
+ <build type="distribute" subtype="directory" value="TempLogHostApp"/>
+ <build type="distribute" subtype="directory" value="TempLogHostApp_Python"/>
<build type="c-source" value="TempDataLogger.c"/>
<build type="c-source" value="Descriptors.c"/>
@@ -64,5 +66,6 @@
<require idref="lufa.drivers.board.temperature"/>
<require idref="lufa.drivers.board.dataflash"/>
<require idref="lufa.drivers.peripheral.adc"/>
+ <require idref="lufa.drivers.peripheral.twi"/>
</module>
</asf>