Skip to content

Commit 211a753

Browse files
committed
Use the cmake_prefix instead
1 parent f261a8a commit 211a753

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

.github/workflows/build-libs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ jobs:
284284
if: ${{ matrix.platform == 'linux' }}
285285
working-directory: source/FMOD_SDL_HEADERS
286286
run: |
287-
make -e SDL2_INCLUDE=../SDL2/include/ SDL2_LIB=../SDL2/build/
287+
make -e SDL2_PREFIX=${{ env.SDL2_DIR }}
288288
289289
290290
# FNA (Only built on Linux, due to being platform agnostic)

source/FMOD_SDL_HEADERS/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
.PHONY: all stub
22

33
FMOD_VERSION = 10
4-
SDL2_INCLUDE = /usr/include/SDL2
5-
SDL2_LIB = /usr/lib
4+
SDL2_PREFIX = ""
65

76
all: stub
87
cp ../FMOD_SDL/FMOD_SDL.c .
98
# Copied from FMOD_SDL's makefile, altered slightly in order to be nicer with CI
10-
$(CC) -O3 -Wall -pedantic -fpic -fPIC -shared -o libfmod_SDL.so FMOD_SDL.c -D_REENTRANT -I$(SDL2_INCLUDE) -L$(SDL2_LIB) -lSDL2 libfmod.so.$(FMOD_VERSION)
9+
$(CC) -O3 -Wall -pedantic -fpic -fPIC -shared -o libfmod_SDL.so FMOD_SDL.c `$(SDL2_PREFIX)/bin/sdl2-config --libs --cflags` libfmod.so.$(FMOD_VERSION)
1110

1211
stub:
1312
$(CC) -fPIC -shared -o libfmod.so.10 fmod_stub.c

0 commit comments

Comments
 (0)