gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-07 00:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix C++ builds, XPLAINBridge project.

Browse Source
This commit is contained in:
Dean Camera 2015-12-22 22:14:09 +11:00
parent 09b6c80555
commit 2fcd50ada8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LUFA/Build/lufa_build.mk
View File

@ -66,15 +66,19 @@ else ifeq ($(ARCH), UC3)
$(warning The UC3 device support is currently EXPERIMENTAL (incomplete and/or non-functional), and is included for preview purposes only.) $(warning The UC3 device support is currently EXPERIMENTAL (incomplete and/or non-functional), and is included for preview purposes only.)
endif endif
# LUFA specific standard build options # Common LUFA C/C++ includes/definitions
C_FLAGS += -I. -I$(patsubst %/,%,$(LUFA_PATH))/.. LUFA_CXX_INCLUDES = -I. -I$(patsubst %/,%,$(LUFA_PATH))/..
C_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL LUFA_CXX_DEFINES = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL
# This flag is required for bootloaders as GCC will emit invalid jump table # This flag is required for bootloaders as GCC will emit invalid jump table
# assembly code for devices with large amounts of flash; the jump table target # assembly code for devices with large amounts of flash; the jump table target
# is extracted from FLASH without using the correct ELPM instruction, resulting # is extracted from FLASH without using the correct ELPM instruction, resulting
# in a pseudo-random jump target. # in a pseudo-random jump target.
C_FLAGS += -fno-jump-tables LUFA_CXX_FLAGS = -fno-jump-tables
# LUFA specific standard build options
C_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
CPP_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
include $(DMBS_PATH)/gcc.mk include $(DMBS_PATH)/gcc.mk

6
Projects/XPLAINBridge/makefile
View File

@ -31,13 +31,13 @@ LD_FLAGS =
# Default target # Default target
all: all:
OBJDIR := obj
# Since this project borrows files from the AVRISP-MKII project which may also have an # Since this project borrows files from the AVRISP-MKII project which may also have an
# identical OBJDIR directory, we need to enforce the use of this project's object file # identical OBJDIR directory, we need to enforce the use of this project's object file
# directory as the one where the build object files are to be stored by pre-pending the # directory as the one where the build object files are to be stored by pre-pending the
# absolute path of the current project to the OBJDIR variable. # absolute path of the current project to the OBJDIR variable.
ifneq ($(OBJDIR),) override OBJDIR:=$(shell pwd)/$(OBJDIR)
override OBJDIR:=$(shell pwd)/$(OBJDIR)
endif
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_PATH)/Build/lufa_core.mk include $(LUFA_PATH)/Build/lufa_core.mk