summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6d160d88..4b9af9c2 100644
--- a/Makefile
+++ b/Makefile
@@ -264,6 +264,9 @@ ifneq ($(BUILD_CLIENT),0)
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
+ else
+ # assume they're in the system default paths (no -I or -L needed)
+ CURL_LIBS=-lcurl
endif
# Use sdl-config if all else fails
ifeq ($(SDL_CFLAGS),)
@@ -366,8 +369,9 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
endif
ifeq ($(USE_CURL),1)
+ CLIENT_CFLAGS += $(CURL_CFLAGS)
ifneq ($(USE_CURL_DLOPEN),1)
- CLIENT_LIBS += -lcurl
+ CLIENT_LIBS += $(CURL_LIBS)
endif
endif
@@ -447,8 +451,9 @@ ifeq ($(PLATFORM),darwin)
endif
ifeq ($(USE_CURL),1)
+ CLIENT_CFLAGS += $(CURL_CFLAGS)
ifneq ($(USE_CURL_DLOPEN),1)
- CLIENT_LIBS += -lcurl
+ CLIENT_LIBS += $(CURL_LIBS)
endif
endif
@@ -658,8 +663,9 @@ ifeq ($(PLATFORM),freebsd)
endif
ifeq ($(USE_CURL),1)
+ CLIENT_CFLAGS += $(CURL_CFLAGS)
ifeq ($(USE_CURL_DLOPEN),1)
- CLIENT_LIBS += -lcurl
+ CLIENT_LIBS += $(CURL_LIBS)
endif
endif
@@ -750,7 +756,7 @@ ifeq ($(PLATFORM),openbsd)
ifeq ($(USE_CURL),1)
ifneq ($(USE_CURL_DLOPEN),1)
- CLIENT_LIBS += -lcurl
+ CLIENT_LIBS += $(CURL_LIBS)
endif
endif
else # ifeq openbsd