Revision ab0b6b11 core/core.mk
core/core.mk | ||
---|---|---|
30 | 30 |
AMIROOSCOREINC = $(AMIROOS_CORE_DIR)inc |
31 | 31 |
|
32 | 32 |
# C source files |
33 |
<<<<<<< Updated upstream |
|
34 | 33 |
AMIROOSCORECSRC = $(wildcard $(AMIROOS_CORE_DIR)src/*.c) |
35 |
======= |
|
36 | 34 |
AMIROOSCORECSRC = $(AMIROOS_CORE_DIR)src/aos_debug.c \ |
37 | 35 |
$(AMIROOS_CORE_DIR)src/aos_iostream.c \ |
38 | 36 |
$(AMIROOS_CORE_DIR)src/aos_rtcan.c \ |
... | ... | |
42 | 40 |
$(AMIROOS_CORE_DIR)src/aos_time.c \ |
43 | 41 |
$(AMIROOS_CORE_DIR)src/aos_timer.c \ |
44 | 42 |
$(AMIROOS_CORE_DIR)src/aos_unittest.c |
45 |
>>>>>>> Stashed changes |
|
46 | 43 |
|
47 | 44 |
# C++ source files |
48 | 45 |
AMIROOSCORECPPSRC = $(wildcard $(AMIROOS_CORE_DIR)src/*.c?*) |
Also available in: Unified diff