Merge branch 'master' of https://github.com/GrangerHub/tremulous

GrangerHub · Mar 30, 2020 · 0af4838 · 0af4838
2 parents eeeb57f + 38cbdc8
commit 0af4838
Show file tree

Hide file tree

Showing 38 changed files with 53,769 additions and 51,139 deletions.
diff --git a/Makefile b/Makefile
@@ -450,9 +450,13 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
   endif
 
   ifeq ($(USE_CURL),1)
-    CLIENT_CFLAGS += $(CURL_CFLAGS)
     ifneq ($(USE_CURL_DLOPEN),1)
       CLIENT_LIBS += $(CURL_LIBS)
+      ifeq ($(USE_LOCAL_HEADERS),1)
+        CLIENT_CFLAGS += -I$(CURLHDIR)
+      else
+	CLIENT_CFLAGS += $(CURL_CFLAGS)
+      endif
     endif
   endif
 
@@ -640,7 +644,7 @@ ifdef MINGW
 
   # In the absence of wspiapi.h, require Windows XP or later
   ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1)
-  	# FIXIT-L Update WINVER=_WIN32_WINNT_WIN7 (see https://msdn.microsoft.com/en-us/library/6sehtctf.aspx)
+    # FIXIT-L Update WINVER=_WIN32_WINNT_WIN7 (see https://msdn.microsoft.com/en-us/library/6sehtctf.aspx)
     BASE_CFLAGS += -DWINVER=0x501
   endif