AntonioND/nitro-engine
1
Fork 0
mirror of https://github.com/AntonioND/nitro-engine.git synced 2025-06-19 00:55:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

templates: examples: Fix linker invocation for C++

Browse Source 
Using g++ to link object files automatically links the STD of C++. It looks
like this library is linked outside of the start/end-group commands with
the other libraries, which causes undefined reference errors when linking
C++ projects that use standard library functions that interface with the
OS, like `fopen()`.

Thanks to @lifehackerhansol for the report and testing the fix.
This commit is contained in:
Antonio Niño Díaz 2024-03-26 18:54:01 +00:00
parent 5ea29c4f81
commit d7ecc5cc4d
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/Makefile.example.blocksds
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
# #
# SPDX-FileContributor: Antonio Niño Díaz, 2023 # SPDX-FileContributor: Antonio Niño Díaz, 2023-2024
export BLOCKSDS ?= /opt/blocksds/core export BLOCKSDS ?= /opt/blocksds/core
export BLOCKSDSEXT ?= /opt/blocksds/external export BLOCKSDSEXT ?= /opt/blocksds/external
@ -71,6 +71,7 @@ endif
PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi- PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi-
CC := $(PREFIX)gcc CC := $(PREFIX)gcc
CXX := $(PREFIX)g++ CXX := $(PREFIX)g++
LD := $(PREFIX)gcc
OBJDUMP := $(PREFIX)objdump OBJDUMP := $(PREFIX)objdump
MKDIR := mkdir MKDIR := mkdir
RM := rm -rf RM := rm -rf
@ -116,10 +117,8 @@ SPECS := $(BLOCKSDS)/sys/crts/ds_arm9.specs
WARNFLAGS := -Wall WARNFLAGS := -Wall
ifeq ($(SOURCES_CPP),) ifeq ($(SOURCES_CPP),)
LD := $(CC)
LIBS += -lc LIBS += -lc
else else
LD := $(CXX)
LIBS += -lstdc++ -lc LIBS += -lstdc++ -lc
endif endif

5
examples/templates/3d_dual_screen/Makefile.blocksds
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
# #
# SPDX-FileContributor: Antonio Niño Díaz, 2023 # SPDX-FileContributor: Antonio Niño Díaz, 2023-2024
BLOCKSDS ?= /opt/blocksds/core BLOCKSDS ?= /opt/blocksds/core
BLOCKSDSEXT ?= /opt/blocksds/external BLOCKSDSEXT ?= /opt/blocksds/external
@ -70,6 +70,7 @@ endif
PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi- PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi-
CC := $(PREFIX)gcc CC := $(PREFIX)gcc
CXX := $(PREFIX)g++ CXX := $(PREFIX)g++
LD := $(PREFIX)gcc
OBJDUMP := $(PREFIX)objdump OBJDUMP := $(PREFIX)objdump
MKDIR := mkdir MKDIR := mkdir
RM := rm -rf RM := rm -rf
@ -115,10 +116,8 @@ ARCH := -march=armv5te -mtune=arm946e-s
WARNFLAGS := -Wall WARNFLAGS := -Wall
ifeq ($(SOURCES_CPP),) ifeq ($(SOURCES_CPP),)
LD := $(CC)
LIBS += -lc LIBS += -lc
else else
LD := $(CXX)
LIBS += -lstdc++ -lc LIBS += -lstdc++ -lc
endif endif

5
examples/templates/3d_single_screen/Makefile.blocksds
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
# #
# SPDX-FileContributor: Antonio Niño Díaz, 2023 # SPDX-FileContributor: Antonio Niño Díaz, 2023-2024
BLOCKSDS ?= /opt/blocksds/core BLOCKSDS ?= /opt/blocksds/core
BLOCKSDSEXT ?= /opt/blocksds/external BLOCKSDSEXT ?= /opt/blocksds/external
@ -70,6 +70,7 @@ endif
PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi- PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi-
CC := $(PREFIX)gcc CC := $(PREFIX)gcc
CXX := $(PREFIX)g++ CXX := $(PREFIX)g++
LD := $(PREFIX)gcc
OBJDUMP := $(PREFIX)objdump OBJDUMP := $(PREFIX)objdump
MKDIR := mkdir MKDIR := mkdir
RM := rm -rf RM := rm -rf
@ -115,10 +116,8 @@ ARCH := -march=armv5te -mtune=arm946e-s
WARNFLAGS := -Wall WARNFLAGS := -Wall
ifeq ($(SOURCES_CPP),) ifeq ($(SOURCES_CPP),)
LD := $(CC)
LIBS += -lc LIBS += -lc
else else
LD := $(CXX)
LIBS += -lstdc++ -lc LIBS += -lstdc++ -lc
endif endif

5
examples/templates/using_nflib/Makefile.blocksds
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
# #
# SPDX-FileContributor: Antonio Niño Díaz, 2023 # SPDX-FileContributor: Antonio Niño Díaz, 2023-2024
BLOCKSDS ?= /opt/blocksds/core BLOCKSDS ?= /opt/blocksds/core
BLOCKSDSEXT ?= /opt/blocksds/external BLOCKSDSEXT ?= /opt/blocksds/external
@ -71,6 +71,7 @@ endif
PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi- PREFIX := $(ARM_NONE_EABI_PATH)arm-none-eabi-
CC := $(PREFIX)gcc CC := $(PREFIX)gcc
CXX := $(PREFIX)g++ CXX := $(PREFIX)g++
LD := $(PREFIX)gcc
OBJDUMP := $(PREFIX)objdump OBJDUMP := $(PREFIX)objdump
MKDIR := mkdir MKDIR := mkdir
RM := rm -rf RM := rm -rf
@ -116,10 +117,8 @@ ARCH := -march=armv5te -mtune=arm946e-s
WARNFLAGS := -Wall WARNFLAGS := -Wall
ifeq ($(SOURCES_CPP),) ifeq ($(SOURCES_CPP),)
LD := $(CC)
LIBS += -lc LIBS += -lc
else else
LD := $(CXX)
LIBS += -lstdc++ -lc LIBS += -lstdc++ -lc
endif endif