Skip to content
Closed
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions nall/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ endif

# global compiler flags
ifeq ($(cl),true)
flags.c = -TC -std:c11
flags.cpp = -TP -std:c++17 -EHsc
flags.c = -TC -std:c11 $(CFLAGS)
flags.cpp = -TP -std:c++17 -EHsc $(CXXFLAGS)
flags += -nologo -permissive- -utf-8 -W2 -Fd$(object.path)/
options += -nologo $(if $(findstring clang,$(compiler)),-fuse-ld=lld) -link
else
flags.c = -x c -std=c11
flags.cpp = -x c++ -std=c++17
flags.c = -x c -std=c11 $(CFLAGS)
flags.cpp = -x c++ -std=c++17 $(CXXFLAGS)
flags.objc = -x objective-c -std=c11
flags.objcpp = -x objective-c++ -std=c++17
flags.deps = -MMD -MP -MF $(@:.o=.d)
Expand Down Expand Up @@ -261,7 +261,7 @@ endif
ifeq ($(findstring clang++,$(compiler)),clang++)
flags += -fno-strict-aliasing -fwrapv
ifneq ($(platform),macos)
options += -fuse-ld=lld
options += -fuse-ld=lld$(subst clang++,,$(compiler))
endif
# gcc settings
else ifeq ($(findstring g++,$(compiler)),g++)
Expand Down
Loading