aboutsummaryrefslogtreecommitdiff
path: root/unix/Makefile
diff options
context:
space:
mode:
authorDamien George2014-01-21 21:40:13 +0000
committerDamien George2014-01-21 21:40:13 +0000
commit55baff4c9bcbc001cbb8972c289ebfa356d4665b (patch)
treebd086f9ddf8c5f2db9642ee04fc382064ebd2029 /unix/Makefile
parent91d457a27752fa125e9c6107bf51c918e021dc95 (diff)
Revamp qstrs: they now include length and hash.
Can now have null bytes in strings. Can define ROM qstrs per port using qstrdefsport.h
Diffstat (limited to 'unix/Makefile')
-rw-r--r--unix/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/Makefile b/unix/Makefile
index 454ded79a..7a4ce3e16 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -2,6 +2,9 @@
PROG = micropython
all: $(PROG)
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h
+
# include py core make definitions
include ../py/py.mk
@@ -27,7 +30,7 @@ SRC_C = \
file.c \
socket.c \
-OBJ = $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) $(PY_O)
+OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
LIB = -lreadline
# the following is needed for BSD
#LIB += -ltermcap
@@ -40,7 +43,7 @@ ifndef DEBUG
endif
$(Q)size $(PROG)
-$(BUILD)/%.o: %.c
+$(BUILD)/%.o: %.c $(QSTR_DEFS)
$(ECHO) "CC $<"
$(Q)$(CC) $(CFLAGS) -c -o $@ $<