From b0a41a3af62abf1b1127e64f9c6940c868bbc58d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Aug 2020 13:07:57 -0400 Subject: knarc/msgenc ldflags patch --- tools/knarc/Makefile | 3 --- tools/msgenc/Makefile | 3 --- 2 files changed, 6 deletions(-) diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile index 1c33e9f6..7dc8bd24 100644 --- a/tools/knarc/Makefile +++ b/tools/knarc/Makefile @@ -1,7 +1,6 @@ CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch CFLAGS := -O2 -Wall -Wno-switch -WSLENV ?= no ifeq ($(OS),Windows_NT) C_SRCS := fnmatch.c LDFLAGS += -lstdc++fs @@ -11,11 +10,9 @@ UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Darwin) LDFLAGS += -lstdc++ -lc++ -lc else -ifneq ($(WSLENV),) LDFLAGS += -lstdc++fs endif endif -endif CXX_SRCS := Source.cpp Narc.cpp C_OBJS := $(C_SRCS:%.c=%.o) CXX_OBJS := $(CXX_SRCS:%.cpp=%.o) diff --git a/tools/msgenc/Makefile b/tools/msgenc/Makefile index f6ddc439..05253e8b 100644 --- a/tools/msgenc/Makefile +++ b/tools/msgenc/Makefile @@ -1,7 +1,6 @@ CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch CFLAGS := -O2 -Wall -Wno-switch -WSLENV ?= no ifeq ($(OS),Windows_NT) LDFLAGS += -lstdc++fs else @@ -9,11 +8,9 @@ UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Darwin) LDFLAGS += -lstdc++ -lc++ -lc else -ifneq ($(WSLENV),) LDFLAGS += -lstdc++fs endif endif -endif CXX_SRCS := msgenc.cpp HEADERS := -- cgit v1.2.3