mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted the new audio backends to compile on Linux

Browse Source
This commit is contained in:
Jonathan De Wachter 2014-10-07 09:35:46 +02:00 committed by Mario Liebisch
parent 5e0e645f46
commit 3fbfde39a5
15 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/Modules/FindFLAC.cmake
View File

@ -7,9 +7,10 @@
# FLAC_LIBRARY # FLAC_LIBRARY
# #
find_path(FLAC_INCLUDE_DIR flac/stream_decoder.h) find_path(FLAC_INCLUDE_DIR FLAC/all.h)
find_path(FLAC_INCLUDE_DIR FLAC/stream_decoder.h)
find_library(FLAC_LIBRARY NAMES flac) find_library(FLAC_LIBRARY NAMES FLAC)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(FLAC DEFAULT_MSG FLAC_LIBRARY FLAC_INCLUDE_DIR) find_package_handle_standard_args(FLAC DEFAULT_MSG FLAC_LIBRARY FLAC_INCLUDE_DIR)

5
cmake/Modules/FindVorbis.cmake
View File

@ -13,9 +13,10 @@ find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
find_library(OGG_LIBRARY NAMES ogg) find_library(OGG_LIBRARY NAMES ogg)
find_library(VORBIS_LIBRARY NAMES vorbis) find_library(VORBIS_LIBRARY NAMES vorbis)
find_library(VORBISFILE_LIBRARY NAMES vorbisfile) find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
find_library(VORBISENC_LIBRARY NAMES vorbisenc)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(VORBIS DEFAULT_MSG VORBIS_LIBRARY VORBISFILE_LIBRARY OGG_LIBRARY VORBIS_INCLUDE_DIR OGG_INCLUDE_DIR) find_package_handle_standard_args(VORBIS DEFAULT_MSG VORBIS_LIBRARY VORBISFILE_LIBRARY VORBISENC_LIBRARY OGG_LIBRARY VORBIS_INCLUDE_DIR OGG_INCLUDE_DIR)
set(VORBIS_INCLUDE_DIRS ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR}) set(VORBIS_INCLUDE_DIRS ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
set(VORBIS_LIBRARIES ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY}) set(VORBIS_LIBRARIES ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY})

0
extlibs/headers/flac/all.h → extlibs/headers/FLAC/all.h vendored
View File

0
extlibs/headers/flac/assert.h → extlibs/headers/FLAC/assert.h vendored
View File

0
extlibs/headers/flac/callback.h → extlibs/headers/FLAC/callback.h vendored
View File

0
extlibs/headers/flac/export.h → extlibs/headers/FLAC/export.h vendored
View File

0
extlibs/headers/flac/format.h → extlibs/headers/FLAC/format.h vendored
View File

0
extlibs/headers/flac/metadata.h → extlibs/headers/FLAC/metadata.h vendored
View File

0
extlibs/headers/flac/ordinals.h → extlibs/headers/FLAC/ordinals.h vendored
View File

0
extlibs/headers/flac/stream_decoder.h → extlibs/headers/FLAC/stream_decoder.h vendored
View File

0
extlibs/headers/flac/stream_encoder.h → extlibs/headers/FLAC/stream_encoder.h vendored
View File

3
include/SFML/System/FileInputStream.hpp
View File

@ -30,6 +30,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include <SFML/Config.hpp>
#include <SFML/System/InputStream.hpp> #include <SFML/System/InputStream.hpp>
#include <SFML/System/Export.hpp>
#include <fstream> #include <fstream>
@ -39,7 +40,7 @@ namespace sf
/// \brief Implementation of input stream based on a file /// \brief Implementation of input stream based on a file
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
class FileInputStream : public InputStream class SFML_SYSTEM_API FileInputStream : public InputStream
{ {
public : public :

3
include/SFML/System/MemoryInputStream.hpp
View File

@ -30,6 +30,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include <SFML/Config.hpp>
#include <SFML/System/InputStream.hpp> #include <SFML/System/InputStream.hpp>
#include <SFML/System/Export.hpp>
#include <cstdlib> #include <cstdlib>
@ -39,7 +40,7 @@ namespace sf
/// \brief Implementation of input stream based on a memory chunk /// \brief Implementation of input stream based on a memory chunk
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
class MemoryInputStream : public InputStream class SFML_SYSTEM_API MemoryInputStream : public InputStream
{ {
public : public :

2
src/SFML/Audio/SoundFileReaderFlac.hpp
View File

@ -29,7 +29,7 @@
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Audio/SoundFileReader.hpp> #include <SFML/Audio/SoundFileReader.hpp>
#include <flac/stream_decoder.h> #include <FLAC/stream_decoder.h>
#include <string> #include <string>
#include <vector> #include <vector>

2
src/SFML/Audio/SoundFileWriterFlac.hpp
View File

@ -29,7 +29,7 @@
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Audio/SoundFileWriter.hpp> #include <SFML/Audio/SoundFileWriter.hpp>
#include <flac/stream_encoder.h> #include <FLAC/stream_encoder.h>
#include <vector> #include <vector>