diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
| commit | 6d372f13528f44919ec193d03248d55a53484968 (patch) | |
| tree | 66f6ba33c6bcfed2b5b3846cf1f309e9b7e715e6 /demos/modules/gadc | |
| parent | 03914d2d2b438062d3062e2c3a588d53d3040cff (diff) | |
| parent | 37966ff16d923bbca53c9464815cb49cbd7fc3be (diff) | |
| download | uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.gz uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.bz2 uGFX-6d372f13528f44919ec193d03248d55a53484968.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'demos/modules/gadc')
| -rw-r--r-- | demos/modules/gadc/demo.mk | 3 | ||||
| -rw-r--r-- | demos/modules/gadc/gwinosc.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/demos/modules/gadc/demo.mk b/demos/modules/gadc/demo.mk new file mode 100644 index 00000000..d66445af --- /dev/null +++ b/demos/modules/gadc/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/modules/gadc +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c index 4cc1fc3a..afa12bfc 100644 --- a/demos/modules/gadc/gwinosc.c +++ b/demos/modules/gadc/gwinosc.c @@ -36,7 +36,7 @@ #include "gwinosc.h" /* Include internal GWIN routines so we can build our own superset class */ -#include "gwin/class_gwin.h" +#include "src/gwin/class_gwin.h" /* The size of our dynamically allocated audio buffer */ #define AUDIOBUFSZ 64*2 |