aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrated pixy into emulator. Pixy is no longer in the common/libs folder but in emulator/libs and discovery/libs

Browse Source
This commit is contained in:
t-moe
2015-04-03 21:42:46 +02:00
parent c570bda350
commit cab86098c5
68 changed files with 6968 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
discovery/Makefile
View File

@@ -34,8 +34,7 @@ INCLUDES=$(LIB_DIR)/StmCoreNPheriph/inc
INCLUDES+=$(LIB_DIR)/StmUsbHost/STM32_USB_Device_Specific
INCLUDES+=$(LIB_DIR)/StmUsbHost/STM32_USB_OTG_Driver/inc
INCLUDES+=$(LIB_DIR)/StmUsbHost/STM32_USB_HOST_Library/Core/inc
INCLUDES+=$(shell find $(COMMON_DIR) -maxdepth 1 -type d ! -path $(COMMON_DIR) ! -path \*/libs)
INCLUDES+=$(COMMON_DIR)/libs/Pixy
INCLUDES+=$(shell find $(COMMON_DIR) -maxdepth 1 -type d ! -path $(COMMON_DIR))
INCLUDES:=$(addprefix -I,$(INCLUDES))
@@ -47,7 +46,7 @@ CFLAGS=$(ARCH_FLAGS) -O0 -g
LIBS=pixy usbhost coreperiph stdc++
LIBSEARCHDIRS=$(LIB_DIR)/StmCoreNPheriph
LIBSEARCHDIRS+=$(LIB_DIR)/StmUsbHost
LIBSEARCHDIRS+=$(COMMON_DIR)/libs/Pixy
LIBSEARCHDIRS+=$(LIB_DIR)/Pixy
LDFLAGS=--specs=nosys.specs -Wl,--gc-sections