1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: =?utf-8?q?Andreas_R=C3=B6nnquist?= <gusnan@debian.org>
Date: Fri, 22 Nov 2024 18:37:29 +0100
Subject: Use system stb_vorbis
---
build/linux/Makefile | 4 ++--
src/common/soundfx.h | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/linux/Makefile b/build/linux/Makefile
index 94a42bf..598538e 100755
--- a/build/linux/Makefile
+++ b/build/linux/Makefile
@@ -25,9 +25,9 @@ ifeq ($(TARGET_OS),Linux)
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_CFLAGS = $(CFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` `$(PKG_CONFIG) --cflags stb`
LOCAL_CPPFLAGS = $(CPPFLAGS)
- LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2`
+ LOCAL_CXXFLAGS = $(CXXFLAGS) $(COMPILERFLAGS) -I../../src/common -I../../src/boulder -I../../src/graph -I../../ext_include/pa `$(PKG_CONFIG) --cflags sdl2` `$(PKG_CONFIG) --cflags stb`
endif
#########
diff --git a/src/common/soundfx.h b/src/common/soundfx.h
index 5cebca8..fa62da5 100755
--- a/src/common/soundfx.h
+++ b/src/common/soundfx.h
@@ -17,13 +17,13 @@
//CHANGE here to one of them
//#define _NO_SOUND_
#define _SDL_SOUND_
-
-#include "common.h"
-#define STB_VORBIS_HEADER_ONLY
-#include "stb_vorbis.c"
-
-#ifdef _SDL_SOUND_
-#include <SDL.h>
+
+#include "common.h"
+#define STB_VORBIS_HEADER_ONLY
+#include "stb_vorbis.h"
+
+#ifdef _SDL_SOUND_
+#include <SDL.h>
#endif
#define SAMPLE_RATE 44100
|
