marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIx build using OpenAL in MSVC

Controls
Sven Eberhardt 2012-10-05 18:02:52 +02:00
parent 28e30294b1
commit 15aa9b961e
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -843,9 +843,20 @@ if(USE_GTK)
endif()
if(USE_OPEN_AL)
FINDLIB(VORBIS_LIBRARY NAMES vorbis)
FINDLIB(VORBISFILE_LIBRARY NAMES vorbisfile)
FINDLIB(OGG_LIBRARY NAMES ogg)
if(MSVC)
if(${FIND_LIBRARY_USE_LIB64_PATHS})
FINDLIB(OPENAL_LIBRARY NAMES OpenAL64)
else()
FINDLIB(OPENAL_LIBRARY NAMES OpenAL32)
endif()
FINDLIB(OGG_LIBRARY NAMES libogg_static)
FINDLIB(VORBIS_LIBRARY NAMES libvorbis_static)
FINDLIB(VORBISFILE_LIBRARY NAMES libvorbisfile_static)
else()
FINDLIB(VORBIS_LIBRARY NAMES vorbis)
FINDLIB(VORBISFILE_LIBRARY NAMES vorbisfile)
FINDLIB(OGG_LIBRARY NAMES ogg)
endif()
endif()
############################################################################
@ -991,6 +1002,7 @@ target_link_libraries(clonk
${VORBIS_LIBRARY}
${VORBISFILE_LIBRARY}
${OGG_LIBRARY}
${OPENAL_LIBRARY}
)
target_link_libraries(c4group
${ZLIB_LIBRARIES}

2
src/platform/C4SoundLoaders.cpp
View File

@ -136,8 +136,6 @@ size_t VorbisLoader::read_func(void* ptr, size_t byte_size, size_t size_to_read,
int VorbisLoader::seek_func(void* datasource, ogg_int64_t offset, int whence)
{
size_t spaceToEOF;
ogg_int64_t actualOffset; // How much we can actually offset it by
CompressedData* data = (CompressedData*)datasource;
switch (whence)

2
src/platform/C4SoundLoaders.h
View File

@ -36,7 +36,7 @@ namespace C4SoundLoaders
#endif
C4SoundHandle final_handle;
SoundInfo(): sound_data(), final_handle(NULL) {}
SoundInfo(): sound_data(), final_handle(0) {}
};
class SoundLoader

4
src/platform/C4SoundSystem.cpp
View File

@ -44,7 +44,7 @@ using namespace C4SoundLoaders;
C4SoundEffect::C4SoundEffect():
Instances (0),
pSample (NULL),
pSample (0),
FirstInst (NULL),
Next (NULL)
{
@ -68,7 +68,7 @@ void C4SoundEffect::Clear()
#ifdef USE_OPEN_AL
if (pSample) alDeleteBuffers(1, &pSample);
#endif
pSample = NULL;
pSample = 0;
}
bool C4SoundEffect::Load(const char *szFileName, C4Group &hGroup)