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 /gfx.mk | |
| 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 'gfx.mk')
| -rw-r--r-- | gfx.mk | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -1,15 +1,15 @@ -GFXINC += $(GFXLIB)/include
+GFXINC += $(GFXLIB)
GFXSRC += $(GFXLIB)/src/gfx.c
-include $(GFXLIB)/src/gos/gos.mk
-include $(GFXLIB)/src/gqueue/gqueue.mk
-include $(GFXLIB)/src/gdisp/gdisp.mk
-include $(GFXLIB)/src/gevent/gevent.mk
-include $(GFXLIB)/src/gtimer/gtimer.mk
-include $(GFXLIB)/src/gwin/gwin.mk
-include $(GFXLIB)/src/ginput/ginput.mk
-include $(GFXLIB)/src/gadc/gadc.mk
-include $(GFXLIB)/src/gaudin/gaudin.mk
-include $(GFXLIB)/src/gaudout/gaudout.mk
-include $(GFXLIB)/src/gmisc/gmisc.mk
-include $(GFXLIB)/src/gfile/gfile.mk
+include $(GFXLIB)/src/gos/sys_make.mk
+include $(GFXLIB)/src/gqueue/sys_make.mk
+include $(GFXLIB)/src/gdisp/sys_make.mk
+include $(GFXLIB)/src/gevent/sys_make.mk
+include $(GFXLIB)/src/gtimer/sys_make.mk
+include $(GFXLIB)/src/gwin/sys_make.mk
+include $(GFXLIB)/src/ginput/sys_make.mk
+include $(GFXLIB)/src/gadc/sys_make.mk
+include $(GFXLIB)/src/gaudin/sys_make.mk
+include $(GFXLIB)/src/gaudout/sys_make.mk
+include $(GFXLIB)/src/gmisc/sys_make.mk
+include $(GFXLIB)/src/gfile/sys_make.mk
|