Rename default config file to mpconfig.h, and port's to mpconfigport.h.

pfalcon · pfalcon · commit b372bfca21cc · 2014-01-03T19:03:11.000+02:00
mpconfig.h will automatically pull mpconfigport.h.
diff --git a/py/defaultconfig.h b/py/defaultconfig.h
diff --git a/py/malloc.c b/py/malloc.c
@@ -3,7 +3,6 @@
 
 #include "misc.h"
 #include "mpconfig.h"
-#include "defaultconfig.h"
 
 #if MICROPY_MEM_STATS
 static int total_bytes_allocated = 0;
diff --git a/py/mpconfig.h b/py/mpconfig.h
@@ -0,0 +1,13 @@
+// This file contains default configuration settings for MicroPython.
+// You can override any of these options using mpconfigport.h file located
+// in a directory of your port.
+
+#include <mpconfigport.h>
+
+// Any options not explicitly set in mpconfigport.h will get default
+// values below.
+
+// Whether to collect memory allocation stats
+#ifndef MICROPY_MEM_STATS
+#define MICROPY_MEM_STATS (1)
+#endif
diff --git a/stm/Makefile b/stm/Makefile
@@ -187,7 +187,7 @@ $(BUILD)/%.o: $(PYSRC)/%.s
 $(BUILD)/%.o: $(PYSRC)/%.S
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(BUILD)/%.o: $(PYSRC)/%.c mpconfig.h
+$(BUILD)/%.o: $(PYSRC)/%.c mpconfigport.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(BUILD)/emitnthumb.o: $(PYSRC)/emitnative.c $(PYSRC)/emit.h
diff --git a/stm/mpconfigport.h b/stm/mpconfigport.h
@@ -1,3 +1,5 @@
+#include <stdint.h>
+
 // options to control how Micro Python is built
 
 #define MICROPY_ENABLE_FLOAT        (1)
diff --git a/unix/Makefile b/unix/Makefile
@@ -79,7 +79,7 @@ $(BUILD)/%.o: %.c
 $(BUILD)/%.o: $(PYSRC)/%.S
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(BUILD)/%.o: $(PYSRC)/%.c mpconfig.h
+$(BUILD)/%.o: $(PYSRC)/%.c mpconfigport.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(BUILD)/emitnx64.o: $(PYSRC)/emitnative.c $(PYSRC)/emit.h
@@ -92,7 +92,7 @@ $(BUILD)/emitnthumb.o: $(PYSRC)/emitnative.c $(PYSRC)/emit.h
 $(BUILD)/vm.o: $(PYSRC)/vm.c
 	$(CC) $(CFLAGS) -O3 -c -o $@ $<
 
-$(BUILD)/main.o: mpconfig.h
+$(BUILD)/main.o: mpconfigport.h
 $(BUILD)/parse.o: $(PYSRC)/grammar.h
 $(BUILD)/compile.o: $(PYSRC)/grammar.h
 $(BUILD)/emitcpy.o: $(PYSRC)/emit.h
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#include <stdint.h>`
	`2`	`+`
`1`	`3`	`// options to control how Micro Python is built`
`2`	`4`
`3`	`5`	`#define MICROPY_ENABLE_FLOAT (1)`