mirrors
/
raylib
mirror of https://github.com/raysan5/raylib
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use stb_vorbis.h as header only

This commit is contained in:
Ray 2018-12-21 00:17:44 +01:00
parent e48f2f9d43
commit 4ec4dc691f
12 changed files with 5120 additions and 5122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/others/audio_standalone.c
View File

@ -6,7 +6,7 @@
* *
* DEPENDENCIES: * DEPENDENCIES:
* mini_al.h - Audio device management lib (http://kcat.strangesoft.net/openal.html) * mini_al.h - Audio device management lib (http://kcat.strangesoft.net/openal.html)
* stb_vorbis.c - Ogg audio files loading (http://www.nothings.org/stb_vorbis/) * stb_vorbis.h - Ogg audio files loading (http://www.nothings.org/stb_vorbis/)
* jar_xm.h - XM module file loading * jar_xm.h - XM module file loading
* jar_mod.h - MOD audio file loading * jar_mod.h - MOD audio file loading
* dr_flac.h - FLAC audio file loading * dr_flac.h - FLAC audio file loading

4
projects/Geany/raylib_compile_sources.bat
View File

@ -24,13 +24,13 @@ gcc -O2 -c textures.c -std=c99 -Wall -DPLATFORM_DESKTOP
gcc -O2 -c text.c -std=c99 -Wall -DPLATFORM_DESKTOP gcc -O2 -c text.c -std=c99 -Wall -DPLATFORM_DESKTOP
gcc -O2 -c models.c -std=c99 -Wall -DPLATFORM_DESKTOP gcc -O2 -c models.c -std=c99 -Wall -DPLATFORM_DESKTOP
gcc -O2 -c audio.c -std=c99 -Wall -DPLATFORM_DESKTOP gcc -O2 -c audio.c -std=c99 -Wall -DPLATFORM_DESKTOP
gcc -O2 -c external/stb_vorbis.c -Wall -I.
gcc -O2 -c external/mini_al.c -Wall -I. gcc -O2 -c external/mini_al.c -Wall -I.
gcc -O2 -c utils.c -std=c99 -Wall -DPLATFORM_DESKTOP gcc -O2 -c utils.c -std=c99 -Wall -DPLATFORM_DESKTOP
:: . :: .
:: . > Generate raylib library :: . > Generate raylib library
:: ------------------------------ :: ------------------------------
ar rcs libraylib.a core.o rglfw.o shapes.o textures.o text.o models.o audio.o mini_al.o stb_vorbis.o utils.o ar rcs libraylib.a core.o rglfw.o shapes.o textures.o text.o models.o audio.o mini_al.o utils.o
:: . :: .
:: > Installing raylib library :: > Installing raylib library
:: ----------------------------- :: -----------------------------

BIN
projects/Notepad++/npes_saved_mingw.txt
View File

Binary file not shown.

BIN
projects/Notepad++/npes_saved_tcc.txt
View File

Binary file not shown.

1
projects/VS2015.UWP/raylib/raylib.vcxproj
View File

@ -153,7 +153,6 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\src\audio.c" /> <ClCompile Include="..\..\..\src\audio.c" />
<ClCompile Include="..\..\..\src\core.c" /> <ClCompile Include="..\..\..\src\core.c" />
<ClCompile Include="..\..\..\src\external\stb_vorbis.c" />
<ClCompile Include="..\..\..\src\models.c" /> <ClCompile Include="..\..\..\src\models.c" />
<ClCompile Include="..\..\..\src\shapes.c" /> <ClCompile Include="..\..\..\src\shapes.c" />
<ClCompile Include="..\..\..\src\text.c" /> <ClCompile Include="..\..\..\src\text.c" />

1
projects/VS2015/raylib/raylib.vcxproj
View File

@ -235,7 +235,6 @@
<ClCompile Include="..\..\..\src\audio.c" /> <ClCompile Include="..\..\..\src\audio.c" />
<ClCompile Include="..\..\..\src\core.c" /> <ClCompile Include="..\..\..\src\core.c" />
<ClCompile Include="..\..\..\src\external\mini_al.c" /> <ClCompile Include="..\..\..\src\external\mini_al.c" />
<ClCompile Include="..\..\..\src\external\stb_vorbis.c" />
<ClCompile Include="..\..\..\src\models.c" /> <ClCompile Include="..\..\..\src\models.c" />
<ClCompile Include="..\..\..\src\rglfw.c" /> <ClCompile Include="..\..\..\src\rglfw.c" />
<ClCompile Include="..\..\..\src\shapes.c" /> <ClCompile Include="..\..\..\src\shapes.c" />

1
projects/VS2017/raylib/raylib.vcxproj
View File

@ -162,7 +162,6 @@
<ClCompile Include="..\..\..\src\audio.c" /> <ClCompile Include="..\..\..\src\audio.c" />
<ClCompile Include="..\..\..\src\core.c" /> <ClCompile Include="..\..\..\src\core.c" />
<ClCompile Include="..\..\..\src\external\mini_al.c" /> <ClCompile Include="..\..\..\src\external\mini_al.c" />
<ClCompile Include="..\..\..\src\external\stb_vorbis.c" />
<ClCompile Include="..\..\..\src\models.c" /> <ClCompile Include="..\..\..\src\models.c" />
<ClCompile Include="..\..\..\src\rglfw.c" /> <ClCompile Include="..\..\..\src\rglfw.c" />
<ClCompile Include="..\..\..\src\shapes.c" /> <ClCompile Include="..\..\..\src\shapes.c" />

3
src/CMakeLists.txt
View File

@ -47,8 +47,7 @@ add_definitions("-DRAYLIB_CMAKE=1")
if(USE_AUDIO) if(USE_AUDIO)
file(GLOB mini_al external/mini_al.c) file(GLOB mini_al external/mini_al.c)
MESSAGE(STATUS "Audio Backend: mini_al") MESSAGE(STATUS "Audio Backend: mini_al")
file(GLOB stb_vorbis external/stb_vorbis.c) set(sources ${raylib_sources} ${mini_al})
set(sources ${raylib_sources} ${mini_al} ${stb_vorbis})
else() else()
MESSAGE(STATUS "Audio Backend: None (-DUSE_AUDIO=OFF)") MESSAGE(STATUS "Audio Backend: None (-DUSE_AUDIO=OFF)")
set(INCLUDE_AUDIO_MODULE 0) set(INCLUDE_AUDIO_MODULE 0)

9
src/Makefile
View File

@ -404,7 +404,6 @@ endif
ifeq ($(INCLUDE_AUDIO_MODULE),TRUE) ifeq ($(INCLUDE_AUDIO_MODULE),TRUE)
OBJS += audio.o OBJS += audio.o
OBJS += stb_vorbis.o
OBJS += mini_al.o OBJS += mini_al.o
endif endif
@ -537,10 +536,6 @@ audio.o : audio.c raylib.h
mini_al.o : external/mini_al.c external/mini_al.h mini_al.o : external/mini_al.c external/mini_al.h
$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM)
# Compile stb_vorbis library
stb_vorbis.o: external/stb_vorbis.c external/stb_vorbis.h
$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM)
# Compile utils module # Compile utils module
utils.o : utils.c utils.h utils.o : utils.c utils.h
$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM)
@ -628,9 +623,9 @@ endif
# Clean everything # Clean everything
clean: clean:
ifeq ($(PLATFORM_OS),WINDOWS) ifeq ($(PLATFORM_OS),WINDOWS)
del *.o $(RAYLIB_RELEASE_PATH)/libraylib.a $(RAYLIB_RELEASE_PATH)/libraylib.bc $(RAYLIB_RELEASE_PATH)/libraylib.so external/stb_vorbis.o del *.o $(RAYLIB_RELEASE_PATH)/libraylib.a $(RAYLIB_RELEASE_PATH)/libraylib.bc $(RAYLIB_RELEASE_PATH)/libraylib.so
else else
rm -fv *.o $(RAYLIB_RELEASE_PATH)/libraylib.a $(RAYLIB_RELEASE_PATH)/libraylib.bc $(RAYLIB_RELEASE_PATH)/libraylib.so* external/stb_vorbis.o rm -fv *.o $(RAYLIB_RELEASE_PATH)/libraylib.a $(RAYLIB_RELEASE_PATH)/libraylib.bc $(RAYLIB_RELEASE_PATH)/libraylib.so*
endif endif
ifeq ($(PLATFORM),PLATFORM_ANDROID) ifeq ($(PLATFORM),PLATFORM_ANDROID)
rm -rf $(ANDROID_TOOLCHAIN) rm -rf $(ANDROID_TOOLCHAIN)

2
src/audio.c
View File

@ -91,7 +91,7 @@
#include <stdio.h> // Required for: FILE, fopen(), fclose(), fread() #include <stdio.h> // Required for: FILE, fopen(), fclose(), fread()
#if defined(SUPPORT_FILEFORMAT_OGG) #if defined(SUPPORT_FILEFORMAT_OGG)
//#define STB_VORBIS_HEADER_ONLY #define STB_VORBIS_IMPLEMENTATION
#include "external/stb_vorbis.h" // OGG loading functions #include "external/stb_vorbis.h" // OGG loading functions
#endif #endif

5074
src/external/stb_vorbis.c vendored
View File

File diff suppressed because it is too large Load Diff

5145
src/external/stb_vorbis.h vendored
View File

File diff suppressed because it is too large Load Diff