diff options
| author | Damien George | 2014-01-21 21:40:13 +0000 |
|---|---|---|
| committer | Damien George | 2014-01-21 21:40:13 +0000 |
| commit | 55baff4c9bcbc001cbb8972c289ebfa356d4665b (patch) | |
| tree | bd086f9ddf8c5f2db9642ee04fc382064ebd2029 /stm/Makefile | |
| parent | 91d457a27752fa125e9c6107bf51c918e021dc95 (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 'stm/Makefile')
| -rw-r--r-- | stm/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stm/Makefile b/stm/Makefile index 3ea1472dc..9c0fe2acf 100644 --- a/stm/Makefile +++ b/stm/Makefile @@ -1,6 +1,9 @@ # define main target all: all2 +# qstr definitions (must come before including py.mk) +QSTR_DEFS = qstrdefsport.h + # include py core make definitions include ../py/py.mk @@ -131,7 +134,7 @@ SRC_CC3K = \ ccspi.c \ pybcc3k.c \ -OBJ = $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o) $(SRC_FATFS:.c=.o) $(SRC_STM:.c=.o) $(SRC_CC3K:.c=.o)) $(PY_O) +OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o) $(SRC_FATFS:.c=.o) $(SRC_STM:.c=.o) $(SRC_CC3K:.c=.o)) #OBJ += $(addprefix $(BUILD)/, $(SRC_STM_OTG:.c=.o)) all2: $(BUILD) $(BUILD)/flash.dfu @@ -155,7 +158,7 @@ $(BUILD)/%.o: %.s $(ECHO) "AS $<" $(Q)$(AS) -o $@ $< -$(BUILD)/%.o: %.c +$(BUILD)/%.o: %.c $(QSTR_DEFS) $(ECHO) "CC $<" $(Q)$(CC) $(CFLAGS) -c -o $@ $< |