From 1e1384cd1fe4bbe6348479dd2d65b907ce369a5a Mon Sep 17 00:00:00 2001 From: dGr8LookinSparky Date: Mon, 17 Feb 2020 23:49:54 -0500 Subject: [PATCH] Apply enneract's linux fixes. --- .gitattributes | 2 -- Makefile | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 581a5c3ee..000000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -* text eol=lf -README.md eol=crlf \ No newline at end of file diff --git a/Makefile b/Makefile index 1b501f429..03d889ebf 100644 --- a/Makefile +++ b/Makefile @@ -840,6 +840,9 @@ ifeq ($(USE_CURL),1) ifeq ($(USE_CURL_DLOPEN),1) CLIENT_CFLAGS += -DUSE_CURL_DLOPEN endif + ifeq ($(USE_INTERNAL_LIBS),1) + CLIENT_CFLAGS += -I$(CURLHDIR) + endif endif ifeq ($(USE_VOIP),1) @@ -2879,6 +2882,8 @@ clean2: @rm -f $(OBJ_D_FILES) @rm -f $(STRINGOBJ) @rm -f $(TARGETS) + @rm -rf $(B) + @rm -rf $(BUILD_DIR) toolsclean: toolsclean-debug toolsclean-release