Merge pull request #49 from larry-xmos/MAINTEN/v0.1

Apply host directory move in DFU documentation too
2018-03-15 10:44:31 +00:00 · 2018-03-14 17:49:56 +00:00 · 2018-03-14 15:33:45 +00:00 · 2018-03-13 18:34:24 +00:00 · 2018-03-13 17:23:22 +00:00
18 changed files with 5 additions and 2 deletions
--- a/doc_dfu/Makefile
+++ b/doc_dfu/Makefile
@@ -1 +1 @@
-SOURCE_INCLUDE_DIRS=../host/xmosdfu
+SOURCE_INCLUDE_DIRS=../lib_xua/host/xmosdfu
--- a/doc_dfu/building_xmos_dfu.rst
+++ b/doc_dfu/building_xmos_dfu.rst
@@ -4,7 +4,7 @@ Building the XMOS DFU loader - macOS
 ====================================

 The XMOS DFU loader is provided as source as part of the USB Audio
-framework, located in sc_usb_audio/module_dfu/host/xmos_dfu_osx.
+framework, located in lib_xua/host/xmosdfu.

 The loader is compiled using libusb, the code for the loader is contained in the
 file ``xmosdfu.cpp``
--- a/lib_xua/host/windows/testdfu.bat
+++ b/lib_xua/host/windows/testdfu.bat
--- a/lib_xua/host/xmosdfu/Makefile.Linux32
+++ b/lib_xua/host/xmosdfu/Makefile.Linux32
--- a/lib_xua/host/xmosdfu/Makefile.Linux64
+++ b/lib_xua/host/xmosdfu/Makefile.Linux64
--- a/lib_xua/host/xmosdfu/Makefile.OSX32
+++ b/lib_xua/host/xmosdfu/Makefile.OSX32
--- a/lib_xua/host/xmosdfu/Makefile.OSX64
+++ b/lib_xua/host/xmosdfu/Makefile.OSX64
--- a/lib_xua/host/xmosdfu/Makefile.Pi
+++ b/lib_xua/host/xmosdfu/Makefile.Pi
--- a/lib_xua/host/xmosdfu/libusb/Linux32/libusb.h
+++ b/lib_xua/host/xmosdfu/libusb/Linux32/libusb.h
--- a/lib_xua/host/xmosdfu/libusb/Linux64/libusb.h
+++ b/lib_xua/host/xmosdfu/libusb/Linux64/libusb.h
--- a/lib_xua/host/xmosdfu/libusb/OSX32/libusb-1.0.0.dylib
+++ b/lib_xua/host/xmosdfu/libusb/OSX32/libusb-1.0.0.dylib
--- a/lib_xua/host/xmosdfu/libusb/OSX32/libusb.h
+++ b/lib_xua/host/xmosdfu/libusb/OSX32/libusb.h
--- a/lib_xua/host/xmosdfu/libusb/OSX64/libusb-1.0.0.dylib
+++ b/lib_xua/host/xmosdfu/libusb/OSX64/libusb-1.0.0.dylib
--- a/lib_xua/host/xmosdfu/libusb/OSX64/libusb.h
+++ b/lib_xua/host/xmosdfu/libusb/OSX64/libusb.h
--- a/lib_xua/host/xmosdfu/libusb/Rasp/libusb.h
+++ b/lib_xua/host/xmosdfu/libusb/Rasp/libusb.h
--- a/lib_xua/host/xmosdfu/testdfu.sh
+++ b/lib_xua/host/xmosdfu/testdfu.sh
--- a/lib_xua/host/xmosdfu/xmosdfu.cpp
+++ b/lib_xua/host/xmosdfu/xmosdfu.cpp
--- a/lib_xua/module_build_info
+++ b/lib_xua/module_build_info
@@ -17,6 +17,9 @@ VERSION = 0.1.2

 DEPENDENT_MODULES = lib_logging(>=2.1.0) lib_xud(>=0.1.0)

+#ignore host dir
+SOURCE_DIRS = src/*
+
 #core
 EXCLUDE_FILES += descriptors_2.rst
 XCC_FLAGS_xua_endpoint0.c = -Os -mno-dual-issue $(XCC_FLAGS)
Author	SHA1	Message	Date
Ross Owen	711efc8be9	Merge pull request #49 from larry-xmos/MAINTEN/v0.1 Apply host directory move in DFU documentation too	2018-03-15 10:44:31 +00:00
Larry Snizek	566cf12c3f	Apply host directory move in DFU documentation too	2018-03-14 17:49:56 +00:00
xross	b6460a266e	Fixed SOURCE_DIRS to handle subdirs	2018-03-14 15:33:45 +00:00
xross	69319f706d	Ignore dfu src in main build	2018-03-13 18:34:24 +00:00
Larry Snizek	3098e8bce5	Move host directory under lib directory so it gets released	2018-03-13 17:23:22 +00:00