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

Jump to bottom

.mk small changes - removing repeated configs #7972

Merged
merged 2 commits into from
May 28, 2024
Merged

.mk small changes - removing repeated configs #7972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4cc531
minor changes
dimitre May 7, 2024
119fcf9
Merge branch 'openframeworks:master' into mk2
dimitre May 26, 2024
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
1 change: 0 additions & 1 deletion libs/openFrameworksCompiled/project/linux64/config.linux64.default.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@
include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk

PLATFORM_LDFLAGS += -fuse-ld=gold
PLATFORM_LDFLAGS += -lstdc++fs
7 changes: 0 additions & 7 deletions libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk
# Note: Leave a leading space when adding list items with the += operator
################################################################################

#c++ 17 support - comment out two lines below to use c++11
PLATFORM_CFLAGS += -std=c++17
PLATFORM_LDFLAGS += -lstdc++fs
PLATFORM_CXXVER = -std=c++17


PLATFORM_LDFLAGS += -lstdc++fs
PLATFORM_LDFLAGS += -no-pie
# PLATFORM_LDFLAGS += -nostartfiles

Expand Down
3 changes: 1 addition & 2 deletions libs/openFrameworksCompiled/project/osx/config.osx.default.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ endif
PLATFORM_CFLAGS = -stdlib=$(MAC_OS_STD_LIB)

# Warning Flags (http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html)
PLATFORM_CFLAGS += -Wall
PLATFORM_CFLAGS += -Wall -Werror=return-type

# Code Generation Option Flags (http://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html)
PLATFORM_CFLAGS += -fexceptions

PLATFORM_CFLAGS += -Werror=return-type

ifeq ($(shell xcode-select -print-path 2> /dev/null; echo $$?),0)
MAC_OS_XCODE_ROOT=$(shell xcode-select -print-path)
Expand Down