LIBS: renamed SDL2_mixer directory
parent
a65c8a7885
commit
146a0155f2
12
Makefile
12
Makefile
|
@ -151,12 +151,12 @@ update-sdl2:
|
||||||
|
|
||||||
update-sdl2mixer:
|
update-sdl2mixer:
|
||||||
$(call UPDATE_GIT,sdl2_mixer,https://github.com/libsdl-org/SDL_mixer)
|
$(call UPDATE_GIT,sdl2_mixer,https://github.com/libsdl-org/SDL_mixer)
|
||||||
rm -rf contrib/libs/sdl2_mixer/*
|
rm -rf contrib/libs/SDL2_mixer/*
|
||||||
cp -r $(UPDATEDIR)/sdl2_mixer.sync/src/* contrib/libs/sdl2_mixer
|
cp -r $(UPDATEDIR)/sdl2_mixer.sync/src/* contrib/libs/SDL2_mixer
|
||||||
cp -r $(UPDATEDIR)/sdl2_mixer.sync/include/* contrib/libs/sdl2_mixer
|
cp -r $(UPDATEDIR)/sdl2_mixer.sync/include/* contrib/libs/SDL2_mixer
|
||||||
cp -r $(UPDATEDIR)/sdl2_mixer.sync/external/libogg* contrib/libs/sdl2_mixer
|
cp -r $(UPDATEDIR)/sdl2_mixer.sync/external/libogg* contrib/libs/SDL2_mixer
|
||||||
cp -r $(UPDATEDIR)/sdl2_mixer.sync/external/libvorbis* contrib/libs/sdl2_mixer
|
cp -r $(UPDATEDIR)/sdl2_mixer.sync/external/libvorbis* contrib/libs/SDL2_mixer
|
||||||
git checkout -f contrib/libs/sdl2_mixer/CMakeLists.txt
|
git checkout -f contrib/libs/SDL2_mixer/CMakeLists.txt
|
||||||
|
|
||||||
update-glslang:
|
update-glslang:
|
||||||
$(call UPDATE_GIT,glslang,https://github.com/KhronosGroup/glslang.git)
|
$(call UPDATE_GIT,glslang,https://github.com/KhronosGroup/glslang.git)
|
||||||
|
|
|
@ -6,6 +6,6 @@ add_subdirectory(lua54)
|
||||||
add_subdirectory(flatbuffers)
|
add_subdirectory(flatbuffers)
|
||||||
add_subdirectory(gtest)
|
add_subdirectory(gtest)
|
||||||
add_subdirectory(sdl2)
|
add_subdirectory(sdl2)
|
||||||
add_subdirectory(sdl2_mixer)
|
add_subdirectory(SDL2_mixer)
|
||||||
add_subdirectory(simplecpp)
|
add_subdirectory(simplecpp)
|
||||||
add_subdirectory(libuv)
|
add_subdirectory(libuv)
|
||||||
|
|
|
@ -308,7 +308,7 @@ static int voc_get_block(SDL_RWops *src, vs_t *v, SDL_AudioSpec *spec)
|
||||||
default: /* text block or other krapola. */
|
default: /* text block or other krapola. */
|
||||||
for(i = 0; i < sblen; i++)
|
for(i = 0; i < sblen; i++)
|
||||||
{
|
{
|
||||||
if (SDL_RWread(src, &trash, sizeof (Uint8), 1) != 1)
|
if (SDL_RWread(src, trash, sizeof (Uint8), 1) != 1)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue