Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lufa
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Erik Strand
lufa
Commits
b5c251a7
Unverified
Commit
b5c251a7
authored
Dec 31, 2017
by
Dean Camera
Committed by
GitHub
Dec 31, 2017
Browse files
Options
Downloads
Plain Diff
Merge pull request #108 from NicoHood/include_guard
Added include guards for DMBS build modules (thanks to Nico Hood).
parents
2f00be53
29c8f21f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
LUFA/Build/LUFA/lufa-gcc.mk
+5
-0
5 additions, 0 deletions
LUFA/Build/LUFA/lufa-gcc.mk
LUFA/Build/LUFA/lufa-sources.mk
+5
-0
5 additions, 0 deletions
LUFA/Build/LUFA/lufa-sources.mk
with
10 additions
and
0 deletions
LUFA/Build/LUFA/lufa-gcc.mk
+
5
−
0
View file @
b5c251a7
...
@@ -6,6 +6,9 @@
...
@@ -6,6 +6,9 @@
# www.lufa-lib.org
# www.lufa-lib.org
#
#
# Include Guard
ifeq
($(filter LUFA_GCC, $(DMBS_BUILD_MODULES)),)
DMBS_BUILD_MODULES
+=
LUFA_GCC
DMBS_BUILD_MODULES
+=
LUFA_GCC
DMBS_BUILD_TARGETS
+=
DMBS_BUILD_TARGETS
+=
DMBS_BUILD_MANDATORY_VARS
+=
LUFA_PATH ARCH F_USB
DMBS_BUILD_MANDATORY_VARS
+=
LUFA_PATH ARCH F_USB
...
@@ -41,3 +44,5 @@ LUFA_CXX_DEFINES = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)U
...
@@ -41,3 +44,5 @@ LUFA_CXX_DEFINES = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)U
# LUFA specific standard build options
# LUFA specific standard build options
C_FLAGS
+=
$(
LUFA_CXX_INCLUDES
)
$(
LUFA_CXX_DEFINES
)
$(
LUFA_CXX_FLAGS
)
C_FLAGS
+=
$(
LUFA_CXX_INCLUDES
)
$(
LUFA_CXX_DEFINES
)
$(
LUFA_CXX_FLAGS
)
CPP_FLAGS
+=
$(
LUFA_CXX_INCLUDES
)
$(
LUFA_CXX_DEFINES
)
$(
LUFA_CXX_FLAGS
)
CPP_FLAGS
+=
$(
LUFA_CXX_INCLUDES
)
$(
LUFA_CXX_DEFINES
)
$(
LUFA_CXX_FLAGS
)
endif
This diff is collapsed.
Click to expand it.
LUFA/Build/LUFA/lufa-sources.mk
+
5
−
0
View file @
b5c251a7
...
@@ -6,6 +6,9 @@
...
@@ -6,6 +6,9 @@
# www.lufa-lib.org
# www.lufa-lib.org
#
#
# Include Guard
ifeq
($(filter LUFA_SOURCES, $(DMBS_BUILD_MODULES)),)
DMBS_BUILD_MODULES
+=
LUFA_SOURCES
DMBS_BUILD_MODULES
+=
LUFA_SOURCES
DMBS_BUILD_TARGETS
+=
DMBS_BUILD_TARGETS
+=
DMBS_BUILD_MANDATORY_VARS
+=
LUFA_PATH ARCH
DMBS_BUILD_MANDATORY_VARS
+=
LUFA_PATH ARCH
...
@@ -93,3 +96,5 @@ LUFA_SRC_ALL_FILES := $(LUFA_SRC_USB) \
...
@@ -93,3 +96,5 @@ LUFA_SRC_ALL_FILES := $(LUFA_SRC_USB) \
$(
LUFA_SRC_SERIAL
)
\
$(
LUFA_SRC_SERIAL
)
\
$(
LUFA_SRC_TWI
)
\
$(
LUFA_SRC_TWI
)
\
$(
LUFA_SRC_PLATFORM
)
$(
LUFA_SRC_PLATFORM
)
endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment