ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow libcurl to be in a non-standard location on all platforms

Browse source 
We didn't add CURL_CFLAGS to CLIENT_CFLAGS on all platforms, and didn't
use CURL_LIBS at all, so if "pkg-config --libs" returned "-L... -lcurl"
or even "/.../libcurl.a", it wouldn't work.
This commit is contained in:
Simon McVittie 2013-05-19 20:57:04 +01:00
parent 608347c84d
commit b1da355644
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -271,6 +271,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),)
@ -375,8 +378,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
@ -456,8 +460,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
@ -666,8 +671,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
@ -760,7 +766,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