diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
commit | 2b47a0708602b45b0b5db120a496bf92232aa4b1 (patch) | |
tree | 6c5965b6bf1d109b853efe64777bbc7ee5548882 /src/gaudio | |
parent | c06bff3304ed234c3a7f96fd049755ac59228ef7 (diff) | |
parent | 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 (diff) | |
download | uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.gz uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.bz2 uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.zip |
Merge branch 'master' into newmouse
Diffstat (limited to 'src/gaudio')
-rw-r--r-- | src/gaudio/gaudio_gaudio.c (renamed from src/gaudio/gaudio.c) | 6 | ||||
-rw-r--r-- | src/gaudio/sys_make.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gaudio/gaudio.c b/src/gaudio/gaudio_gaudio.c index ab1f95ee..bb12e6d2 100644 --- a/src/gaudio/gaudio.c +++ b/src/gaudio/gaudio_gaudio.c @@ -6,7 +6,7 @@ */ /** - * @file src/gaudio/gaudio.c + * @file src/gaudio/gaudio_gaudio.c * @brief GAUDIO sub-system code. * * @addtogroup GAUDIO @@ -17,7 +17,7 @@ #if GFX_USE_GAUDIO #if GAUDIO_NEED_PLAY - #include "src/gaudio/driver_play.h" + #include "driver_play.h" static gfxQueueASync playList; static gfxSem playComplete; @@ -32,7 +32,7 @@ #endif #if GAUDIO_NEED_RECORD - #include "src/gaudio/driver_record.h" + #include "driver_record.h" static gfxQueueGSync recordList; static uint16_t recordFlags; diff --git a/src/gaudio/sys_make.mk b/src/gaudio/sys_make.mk index 438892c0..ea02e010 100644 --- a/src/gaudio/sys_make.mk +++ b/src/gaudio/sys_make.mk @@ -1 +1 @@ -GFXSRC += $(GFXLIB)/src/gaudio/gaudio.c +GFXSRC += $(GFXLIB)/src/gaudio/gaudio_gaudio.c |