put all m-stack stuff in one place. not sure if i can be bothered doing usb
stuff right now though
--- a/Makefile.mx250_ckpi Sat Feb 18 16:25:38 2017 +0000
+++ b/Makefile.mx250_ckpi Sat Feb 18 16:52:47 2017 +0000
@@ -50,17 +50,10 @@
OBJECT := $(SOURCE:.c=.o)
OBJECT := $(foreach F,$(OBJECT),$(PLATFORM)/$(F))
-# m-stack USB
-HEADER += usb/include/usb_cdc.h usb/include/usb_ch9.h usb/include/usb.h
-HEADER += usb/include/usb_hid.h usb/include/usb_microsoft.h
-HEADER += usb/src/usb_hal.h usb/src/usb_winusb.h
-HEADER += usb/usb_config.h
-OBJECT += $(PLATFORM)/usb.o $(PLATFORM)/usb_cdc.o $(PLATFORM)/usb_descriptors.o
-
ELF := $(PLATFORM)/$(TARGET:.hex=.elf)
MAP := $(PLATFORM)/$(TARGET:.hex=.map)
-CFLAGS := -mprocessor=$(CPU) -DMINDY_$(PLATFORM) -D__XC32__ -mips16 -Os -std=gnu99 -fverbose-asm -save-temps=obj -mdebugger -Iusb -Iusb/include -I/usr/src
+CFLAGS := -mprocessor=$(CPU) -DMINDY_$(PLATFORM) -D__XC32__ -mips16 -Os -std=gnu99 -fverbose-asm -save-temps=obj -mdebugger
CLINK := -mno-peripheral-libs -Wl,-T$(LKR1),-T$(LKR2),-Map=$(MAP),--defsym,_min_heap_size=$(HEAP),--defsym,_min_stack_size=$(STACK)
# <plib.h> either use -fgnu89-inline for gcc or --allow-multiple-definition for ld
@@ -103,7 +96,13 @@
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
# m-stack USB
+CFLAGS += -Iusb -Iusb/include -I/usr/src
+HEADER += usb/include/usb_cdc.h usb/include/usb_ch9.h usb/include/usb.h
+HEADER += usb/include/usb_hid.h usb/include/usb_microsoft.h
+HEADER += usb/src/usb_hal.h usb/src/usb_winusb.h
+HEADER += usb/usb_config.h
+OBJECT += $(PLATFORM)/usb.o $(PLATFORM)/usb_cdc.o $(PLATFORM)/usb_descriptors.o
$(PLATFORM)/%.o:usb/%.c
- $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
$(PLATFORM)/%.o:usb/src/%.c
- $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
--- a/Makefile.mx270_ckpi Sat Feb 18 16:25:38 2017 +0000
+++ b/Makefile.mx270_ckpi Sat Feb 18 16:52:47 2017 +0000
@@ -50,17 +50,10 @@
OBJECT := $(SOURCE:.c=.o)
OBJECT := $(foreach F,$(OBJECT),$(PLATFORM)/$(F))
-# m-stack USB
-HEADER += usb/include/usb_cdc.h usb/include/usb_ch9.h usb/include/usb.h
-HEADER += usb/include/usb_hid.h usb/include/usb_microsoft.h
-HEADER += usb/src/usb_hal.h usb/src/usb_winusb.h
-HEADER += usb/usb_config.h
-OBJECT += $(PLATFORM)/usb.o $(PLATFORM)/usb_cdc.o $(PLATFORM)/usb_descriptors.o
-
ELF := $(PLATFORM)/$(TARGET:.hex=.elf)
MAP := $(PLATFORM)/$(TARGET:.hex=.map)
-CFLAGS := -mprocessor=$(CPU) -DMINDY_$(PLATFORM) -D__XC32__ -mips16 -Os -std=gnu99 -fverbose-asm -save-temps=obj -mdebugger -Iusb -Iusb/include -I/usr/src
+CFLAGS := -mprocessor=$(CPU) -DMINDY_$(PLATFORM) -D__XC32__ -mips16 -Os -std=gnu99 -fverbose-asm -save-temps=obj -mdebugger
CLINK := -mno-peripheral-libs -Wl,-T$(LKR1),-T$(LKR2),-Map=$(MAP),--defsym,_min_heap_size=$(HEAP),--defsym,_min_stack_size=$(STACK)
# <plib.h> either use -fgnu89-inline for gcc or --allow-multiple-definition for ld
@@ -103,7 +96,13 @@
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
# m-stack USB
+CFLAGS += -Iusb -Iusb/include -I/usr/src
+HEADER += usb/include/usb_cdc.h usb/include/usb_ch9.h usb/include/usb.h
+HEADER += usb/include/usb_hid.h usb/include/usb_microsoft.h
+HEADER += usb/src/usb_hal.h usb/src/usb_winusb.h
+HEADER += usb/usb_config.h
+OBJECT += $(PLATFORM)/usb.o $(PLATFORM)/usb_cdc.o $(PLATFORM)/usb_descriptors.o
$(PLATFORM)/%.o:usb/%.c
- $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
$(PLATFORM)/%.o:usb/src/%.c
- $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
--- a/Makefile.sdxl Sat Feb 18 16:25:38 2017 +0000
+++ b/Makefile.sdxl Sat Feb 18 16:52:47 2017 +0000
@@ -50,17 +50,10 @@
OBJECT := $(SOURCE:.c=.o)
OBJECT := $(foreach F,$(OBJECT),$(PLATFORM)/$(F))
-# m-stack USB
-HEADER += usb/include/usb_cdc.h usb/include/usb_ch9.h usb/include/usb.h
-HEADER += usb/include/usb_hid.h usb/include/usb_microsoft.h
-HEADER += usb/src/usb_hal.h usb/src/usb_winusb.h
-HEADER += usb/usb_config.h
-OBJECT += $(PLATFORM)/usb.o $(PLATFORM)/usb_cdc.o $(PLATFORM)/usb_descriptors.o
-
ELF := $(PLATFORM)/$(TARGET:.hex=.elf)
MAP := $(PLATFORM)/$(TARGET:.hex=.map)
-CFLAGS := -mprocessor=$(CPU) -DMINDY_$(PLATFORM) -D__XC32__ -mips16 -Os -std=gnu99 -fverbose-asm -save-temps=obj -mdebugger -Iusb -Iusb/include -I/usr/src
+CFLAGS := -mprocessor=$(CPU) -DMINDY_$(PLATFORM) -D__XC32__ -mips16 -Os -std=gnu99 -fverbose-asm -save-temps=obj -mdebugger
CLINK := -mno-peripheral-libs -Wl,-T$(LKR1),-T$(LKR2),-Map=$(MAP),--defsym,_min_heap_size=$(HEAP),--defsym,_min_stack_size=$(STACK)
# <plib.h> either use -fgnu89-inline for gcc or --allow-multiple-definition for ld
@@ -107,3 +100,15 @@
$(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
$(PLATFORM)/%.o:usb/src/%.c
$(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
+
+# m-stack USB
+CFLAGS += -Iusb -Iusb/include -I/usr/src
+HEADER += usb/include/usb_cdc.h usb/include/usb_ch9.h usb/include/usb.h
+HEADER += usb/include/usb_hid.h usb/include/usb_microsoft.h
+HEADER += usb/src/usb_hal.h usb/src/usb_winusb.h
+HEADER += usb/usb_config.h
+OBJECT += $(PLATFORM)/usb.o $(PLATFORM)/usb_cdc.o $(PLATFORM)/usb_descriptors.o
+$(PLATFORM)/%.o:usb/%.c
+ $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@
+$(PLATFORM)/%.o:usb/src/%.c
+ $(CC) $(CFLAGS) -fno-strict-aliasing $(CPPFLAGS) -c $< -o $@