[ioquake3] 16/33: Fix setting cflags/libs from sdl2-config

Simon McVittie smcv at debian.org
Mon Oct 30 14:00:26 UTC 2017


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit e657dbd6b26a54c024a668c01add5a1d32050e91
Author: Zack Middleton <zack at cloemail.com>
Date:   Mon Oct 2 02:02:08 2017 -0500

    Fix setting cflags/libs from sdl2-config
    
    SDL_CFLAGS and SDL_LIBS assignment was "only if absent". However due
    to previously assigning them to "pkg-config sdl2" values, the values
    from sdl2-config were ignored.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 54ea5d3..464ad3c 100644
--- a/Makefile
+++ b/Makefile
@@ -301,8 +301,8 @@ endif
 # Use sdl2-config if all else fails
 ifeq ($(SDL_CFLAGS),)
   ifneq ($(call bin_path, sdl2-config),)
-    SDL_CFLAGS ?= $(shell sdl2-config --cflags)
-    SDL_LIBS ?= $(shell sdl2-config --libs)
+    SDL_CFLAGS = $(shell sdl2-config --cflags)
+    SDL_LIBS = $(shell sdl2-config --libs)
   endif
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git



More information about the Pkg-games-commits mailing list