From: =?utf-8?q?Andreas_R=C3=B6nnquist?= Date: Fri, 22 Nov 2024 18:37:29 +0100 Subject: Build with system packaged SDL --- build/linux/Makefile | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/build/linux/Makefile b/build/linux/Makefile index 423df9f..b11f3bb 100755 --- a/build/linux/Makefile +++ b/build/linux/Makefile @@ -17,29 +17,19 @@ TARGET_ARCH = $(shell uname -m) CC = g++ COMPILERFLAGS = -Wall - -ifeq ($(TARGET_OS),Linux) - LDFLAGS_PLAIN = -lpthread - ifeq ($(TARGET_ARCH),x86_64) - LD_LIBSDL = ../../lib/linux_x64/libSDL2.so - EXE_PATH = ../../exe/linux_x64/ - LDFLAGS_GFX += -L../../lib/linux_x64 -lSDL2 '-Wl,-R,$$ORIGIN/.' - else ifeq ($(TARGET_ARCH),i686) - LD_LIBSDL = ../../lib/linux_x86/libSDL2.so - EXE_PATH = ../../exe/linux_x86/ - LDFLAGS_GFX += -L../../lib/linux_x86 -lSDL2 '-Wl,-R,$$ORIGIN/.' - else - LD_LIBSDL = ./boulder - EXE_PATH = ../../exe/linux/ - LDFLAGS_GFX += -lSDL2 - endif - LDFLAGS_GFX_GL = -lGL -L/usr/X11R6/lib -lX11 - LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa -I../../ext_include/sdl - LOCAL_CPPFLAGS = $(CPPFLAGS) - LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa -I../../ext_include/sdl -endif - -######### + +ifeq ($(TARGET_OS),Linux) + LDFLAGS_PLAIN = -lpthread + EXE_PATH = ../../exe/linux_x64/ + LDFLAGS_GFX += `pkg-config --libs sdl2` '-Wl,-R,$$ORIGIN/.' + + LDFLAGS_GFX_GL = -lGL -L/usr/X11R6/lib -lX11 + LOCAL_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` + LOCAL_CPPFLAGS = $(CPPFLAGS) + LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `pkg-config --cflags sdl2` +endif + +######### #objects GRAPH_OBJECTS = ../../src/graph/bmp.o ../../src/graph/targa.o ../../src/graph/jpeg.o \