From a26c2da3be443344f46edda8799594f75ef275d1 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Sun, 9 Mar 2025 03:45:26 -0600 Subject: [PATCH] Remove `DarwinLibrarySearchFlags` variable It seems `PkgConfig` is able to add the library search folder. We keep the `DarwinIncludeSearchFlags` variable since we want to add a system include folder (`-isystem`) for Brew packages, so warnings are not reported for these header files. --- makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/makefile b/makefile index a7b79d66..5a70500a 100644 --- a/makefile +++ b/makefile @@ -56,10 +56,8 @@ WindowsRunPrefix := wine WindowsRunSuffixUnitTest := --gtest_color=yes | cat - DarwinIncludeSearchFlags = -isystem$(shell brew --prefix)/include -DarwinLibrarySearchFlags = -L$(shell brew --prefix)/lib IncludeSearchFlags := $($(TARGET_OS)IncludeSearchFlags) -LibrarySearchFlags := $($(TARGET_OS)LibrarySearchFlags) SpecialPreprocessorFlags := $($(TARGET_OS)SpecialPreprocessorFlags) SpecialWarnFlags := $($(TARGET_OS)SpecialWarnFlags) ExeSuffix := $($(TARGET_OS)ExeSuffix) @@ -80,7 +78,7 @@ SRCS := $(shell find $(SRCDIR) -name '*.cpp') OBJS := $(patsubst $(SRCDIR)/%.cpp,$(INTDIR)/%.o,$(SRCS)) IncludeSearchFlags := $(shell type $(PkgConfig) >/dev/null 2>&1 && $(PkgConfig) --cflags-only-I sdl2) $(IncludeSearchFlags) -LibrarySearchFlags := $(shell type $(PkgConfig) >/dev/null 2>&1 && $(PkgConfig) --libs-only-L sdl2) $(LibrarySearchFlags) +LibrarySearchFlags := $(shell type $(PkgConfig) >/dev/null 2>&1 && $(PkgConfig) --libs-only-L sdl2) Linux_OpenGL_LIBS := -lGLEW -lGL Darwin_OpenGL_LIBS := -lGLEW -framework OpenGL