Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flags for optionally using DaisySP-LGPL #601

Merged
merged 4 commits into from
Jan 8, 2024
Merged

Add flags for optionally using DaisySP-LGPL #601

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
191aad4
Add flags for optionally using DaisySP-LGPL
beserge Dec 14, 2023
20be0bd
Add a script and special makefile for LGPL compliance
beserge Dec 19, 2023
bbcce41
Make LGPL script more portable
beserge Dec 19, 2023
6ebba60
Remove lgpl compliance makefile and script
beserge Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,14 @@ ifdef DAISYSP_DIR
C_INCLUDES += -I$(DAISYSP_DIR)/Source
endif

ifeq ($(USE_DAISYSP_LGPL),1)
C_INCLUDES += -I$(DAISYSP_DIR)/DaisySP-LGPL/Source

C_DEFS += \
-DUSE_DAISYSP_LGPL
endif


# Include FATFS files
# This does not include the additional option files
# for Japanese, Simplified/Traditional Chinese, or Korean
Expand Down Expand Up @@ -246,6 +254,12 @@ LIBS += -ldaisysp
LIBDIR += -L $(DAISYSP_DIR)/build
endif


ifeq ($(USE_DAISYSP_LGPL),1)
LIBS += -ldaisysp-lgpl
LIBDIR += -L $(DAISYSP_DIR)/DaisySP-LGPL/build
endif

LDFLAGS ?=
LDFLAGS += $(MCU) --specs=nano.specs --specs=nosys.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections -Wl,--print-memory-usage

Expand Down
Loading