Ticket #58366: Makefile.patch

Makefile

@@ -1 +1 @@
 # Taken from https://spin.atomicobject.com/2016/08/26/makefile-c-projects/
 
-CC = clang
-CXX = clang++
+CC ?= clang
+CXX ?= clang++
 
 BUILD_DIR ?= build
 SRC_DIRS ?= $(shell find src -type d -not -path src) vendor/glad vendor/nanovg vendor/nanogui
@@ -10 +10 @@
 SRCS := $(shell find $(SRC_DIRS) -maxdepth 1 -name '*.cpp' -or -name '*.c')
 
 INCFLAGS := $(addprefix -I, $(SRC_DIRS)) -Ivendor
-CPPFLAGS ?= $(INCFLAGS) -MMD -MP -g -Wno-multichar -DNANOGUI_GLAD
-CXXFLAGS ?= -std=c++1y
+CPPFLAGS := $(INCFLAGS) $(CPPFLAGS) -MMD -MP -g -Wno-multichar -DNANOGUI_GLAD
+CXXFLAGS += -std=c++1y
 
 ifeq ($(UNAME), Darwin)
+    SDL_FRAMEWORK_DIR ?= /Library/Frameworks
+    ifneq ($(PKG_CONFIG),)
+        CPPFLAGS += `$(PKG_CONFIG) --cflags SDL2` `$(PKG_CONFIG) --cflags SDL2_net`
+        LDFLAGS += `$(PKG_CONFIG) --libs SDL2` `$(PKG_CONFIG) --libs SDL2_net`
+    else ifneq ($(SDL_FRAMEWORK_DIR),)
+        CPPFLAGS += -DSDL_FRAMEWORK=1 -F$(SDL_FRAMEWORK_DIR)
+        LDFLAGS += -F$(SDL_FRAMEWORK_DIR) -framework SDL2 -framework SDL2_net
+    else
+        # Assume CPPFLAGS and LDFLAGS are set up with the right -I and -L flags
+        LDFLAGS += -lSDL2 -lSDL2_net
+    endif
         SRCS += $(shell find $(SRC_DIRS) -maxdepth 1 -name '*.mm')
-        CPPFLAGS += -F/Library/Frameworks
-        LDFLAGS ?= -F/Library/Frameworks -lstdc++ -lm -framework SDL2 -framework SDL2_net -framework OpenGL -framework AppKit
+        LDFLAGS += -lm -framework OpenGL -framework AppKit
         POST_PROCESS ?= dsymutil
 else ifeq ($(UNAME), MINGW64_NT-10.0)
         # Not a great conditional check for "Windows", but works for now.
@@ -65 +75 @@
 
 # Avara
 $(BUILD_DIR)/Avara: $(OBJS) $(BUILD_DIR)/src/Avara.cpp.o
-        $(CXX) $(OBJS) $(BUILD_DIR)/src/Avara.cpp.o -o $@ $(LDFLAGS)
+        $(CXX) $(CXXFLAGS) $(OBJS) $(BUILD_DIR)/src/Avara.cpp.o -o $@ $(LDFLAGS)
         $(POST_PROCESS) $@
 
 # BSPViewer