From d27ca9822d78dc10a094b3e76a12fffabc3a6a8c Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Mon, 10 Jun 2013 20:32:09 +0200 Subject: [PATCH 1/2] Fixed path to libraries --- examples/testusbhostFAT/Makefile | 4 ++-- examples/testusbhostFAT/generic_storage | 2 +- examples/testusbhostFAT/xmem2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/testusbhostFAT/Makefile b/examples/testusbhostFAT/Makefile index b2a06045..47cc738b 100755 --- a/examples/testusbhostFAT/Makefile +++ b/examples/testusbhostFAT/Makefile @@ -35,8 +35,8 @@ EXTRA_FLAGS += -D DISABLE_SERIAL3 # The following are the libraries used. LIB_DIRS = LIB_DIRS += ../../ -LIB_DIRS += xmem2 -LIB_DIRS += generic_storage +LIB_DIRS += ../testusbhostFAT/xmem2 +LIB_DIRS += ../testusbhostFAT/generic_storage # And finally, the part that brings everything together for you. include Arduino_Makefile_master/_Makefile.master diff --git a/examples/testusbhostFAT/generic_storage b/examples/testusbhostFAT/generic_storage index b87902bf..071b65b9 160000 --- a/examples/testusbhostFAT/generic_storage +++ b/examples/testusbhostFAT/generic_storage @@ -1 +1 @@ -Subproject commit b87902bf7a0934b62f43c2176fb11ea318da8629 +Subproject commit 071b65b923b2656bb1e1b622de5272b4ed9a4996 diff --git a/examples/testusbhostFAT/xmem2 b/examples/testusbhostFAT/xmem2 index b2adf124..8bcf5f90 160000 --- a/examples/testusbhostFAT/xmem2 +++ b/examples/testusbhostFAT/xmem2 @@ -1 +1 @@ -Subproject commit b2adf12413e93de01334efeed0e5d46a73eb17ae +Subproject commit 8bcf5f90f8bd967378b6eeebd7fd943f125fbc18 From 8f9948521d7b16bf24a2bae685d222412c894f54 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Mon, 10 Jun 2013 20:32:44 +0200 Subject: [PATCH 2/2] Ignore build directory --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d5b665b9..7e69f457 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.bak *.zip -*.rar \ No newline at end of file +*.rar +build/ \ No newline at end of file