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