folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile: Avoid trying to build using static libraries for libsdl and libsdl2.

Browse source 
Fix #297 (at least for OpenSUSE Leap 42.1)
This commit is contained in:
Mark Pizzolato 2016-03-29 14:06:15 -07:00
parent 736e341fd2
commit 02d9bc304b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
makefile
View file

@ -425,7 +425,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifneq (,$(call find_include,SDL2/SDL)) ifneq (,$(call find_include,SDL2/SDL))
ifneq (,$(call find_lib,SDL2)) ifneq (,$(call find_lib,SDL2))
VIDEO_CCDEFS += -DHAVE_LIBSDL -DUSE_SIM_VIDEO `$(realpath $(dir $(call find_include,SDL2/SDL))../../bin/sdl2-config) --cflags` VIDEO_CCDEFS += -DHAVE_LIBSDL -DUSE_SIM_VIDEO `$(realpath $(dir $(call find_include,SDL2/SDL))../../bin/sdl2-config) --cflags`
VIDEO_LDFLAGS += `$(realpath $(dir $(call find_include,SDL2/SDL))../../bin/sdl2-config) --static-libs` VIDEO_LDFLAGS += `$(realpath $(dir $(call find_include,SDL2/SDL))../../bin/sdl2-config) --libs`
VIDEO_FEATURES = - video capabilities provided by libSDL2 (Simple Directmedia Layer) VIDEO_FEATURES = - video capabilities provided by libSDL2 (Simple Directmedia Layer)
DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/sim_ws.c DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/sim_ws.c
DISPLAYVT = ${DISPLAYD}/vt11.c DISPLAYVT = ${DISPLAYD}/vt11.c
@ -439,7 +439,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifneq (,$(call find_include,SDL/SDL)) ifneq (,$(call find_include,SDL/SDL))
ifneq (,$(call find_lib,SDL)) ifneq (,$(call find_lib,SDL))
VIDEO_CCDEFS += -DHAVE_LIBSDL -DUSE_SIM_VIDEO `$(realpath $(dir $(call find_include,SDL/SDL))../../bin/sdl-config) --cflags` VIDEO_CCDEFS += -DHAVE_LIBSDL -DUSE_SIM_VIDEO `$(realpath $(dir $(call find_include,SDL/SDL))../../bin/sdl-config) --cflags`
VIDEO_LDFLAGS += `$(realpath $(dir $(call find_include,SDL/SDL))../../bin/sdl-config) --static-libs` VIDEO_LDFLAGS += `$(realpath $(dir $(call find_include,SDL/SDL))../../bin/sdl-config) --libs`
VIDEO_FEATURES = - video capabilities provided by libSDL (Simple Directmedia Layer) VIDEO_FEATURES = - video capabilities provided by libSDL (Simple Directmedia Layer)
DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/sim_ws.c DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/sim_ws.c
DISPLAYVT = ${DISPLAYD}/vt11.c DISPLAYVT = ${DISPLAYD}/vt11.c