Skip to content
Snippets Groups Projects
Commit 469ee7f9 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Update to latest oggvorbis packages

parent 70491dda
No related branches found
No related tags found
No related merge requests found
...@@ -2362,9 +2362,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -2362,9 +2362,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>d4b8ed3fd679a2b484d2d1a66c063908</string> <string>05efbdbed9162e730c1205e50e7487fe</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54981/511789/ogg_vorbis-1.3.3-1.3.6.538971-windows-538971.tar.bz2</string> <string>https://pkg.alchemyviewer.org/repository/autobuild-external/ogg-vorbis/windows/ogg_vorbis-1.3.4-1.3.7.330-windows-330.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -2374,16 +2376,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -2374,16 +2376,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>ec4a657fe639bb458ee5132062146a7a</string> <string>66f64b4640c884c0e3ddf269e32f8022</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54980/511782/ogg_vorbis-1.3.3-1.3.6.538971-windows64-538971.tar.bz2</string> <string>https://pkg.alchemyviewer.org/repository/autobuild-external/ogg-vorbis/windows64/ogg_vorbis-1.3.4-1.3.7.330-windows64-330.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows64</string> <string>windows64</string>
</map> </map>
</map> </map>
<key>version</key> <key>version</key>
<string>1.3.3-1.3.6.538971</string> <string>1.3.4-1.3.7.330</string>
</map> </map>
<key>open-libndofdev</key> <key>open-libndofdev</key>
<map> <map>
......
...@@ -10,33 +10,27 @@ if (USESYSTEMLIBS) ...@@ -10,33 +10,27 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(ogg_vorbis) use_prebuilt_binary(ogg_vorbis)
set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
if (WINDOWS) if (WINDOWS)
set(OGG_LIBRARIES set(OGG_LIBRARIES
optimized ogg_static optimized libogg
debug ogg_static_d) debug libogg)
set(VORBIS_LIBRARIES set(VORBIS_LIBRARIES
optimized vorbis_static optimized libvorbis
debug vorbis_static_d) debug libvorbis)
set(VORBISENC_LIBRARIES
optimized vorbisenc_static
debug vorbisenc_static_d)
set(VORBISFILE_LIBRARIES set(VORBISFILE_LIBRARIES
optimized vorbisfile_static optimized libvorbisfile
debug vorbisfile_static_d) debug libvorbisfile)
else (WINDOWS) else (WINDOWS)
set(OGG_LIBRARIES ogg) set(OGG_LIBRARIES ogg)
set(VORBIS_LIBRARIES vorbis) set(VORBIS_LIBRARIES vorbis)
set(VORBISENC_LIBRARIES vorbisenc)
set(VORBISFILE_LIBRARIES vorbisfile) set(VORBISFILE_LIBRARIES vorbisfile)
endif (WINDOWS) endif (WINDOWS)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
link_directories( link_directories(
${VORBIS_LIBRARY_DIRS} ${VORBIS_LIBRARY_DIRS}
${VORBISENC_LIBRARY_DIRS}
${VORBISFILE_LIBRARY_DIRS} ${VORBISFILE_LIBRARY_DIRS}
${OGG_LIBRARY_DIRS} ${OGG_LIBRARY_DIRS}
) )
...@@ -72,7 +72,10 @@ if(WINDOWS) ...@@ -72,7 +72,10 @@ if(WINDOWS)
libcurl.dll libcurl.dll
libeay32.dll libeay32.dll
libhunspell.dll libhunspell.dll
libogg.dll
libpng16.dll libpng16.dll
libvorbis.dll
libvorbisfile.dll
libwebp.dll libwebp.dll
libxml2.dll libxml2.dll
minizip.dll minizip.dll
......
...@@ -7,4 +7,4 @@ set(LLAUDIO_INCLUDE_DIRS ...@@ -7,4 +7,4 @@ set(LLAUDIO_INCLUDE_DIRS
) )
# be exhaustive here # be exhaustive here
set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES}) set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})
...@@ -18,7 +18,6 @@ include_directories( ...@@ -18,7 +18,6 @@ include_directories(
${LLMESSAGE_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS}
${OGG_INCLUDE_DIRS} ${OGG_INCLUDE_DIRS}
${VORBISENC_INCLUDE_DIRS}
${VORBISFILE_INCLUDE_DIRS} ${VORBISFILE_INCLUDE_DIRS}
${VORBIS_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS}
${OPENAL_LIB_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS}
...@@ -84,7 +83,6 @@ target_link_libraries( ...@@ -84,7 +83,6 @@ target_link_libraries(
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
${LLMESSAGE_LIBRARIES} ${LLMESSAGE_LIBRARIES}
${LLVFS_LIBRARIES} ${LLVFS_LIBRARIES}
${VORBISENC_LIBRARIES}
${VORBISFILE_LIBRARIES} ${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES} ${VORBIS_LIBRARIES}
${OGG_LIBRARIES} ${OGG_LIBRARIES}
......
...@@ -552,6 +552,11 @@ def construct(self): ...@@ -552,6 +552,11 @@ def construct(self):
# Hunspell # Hunspell
self.path("libhunspell.dll") self.path("libhunspell.dll")
# Audio
self.path("libogg.dll")
self.path("libvorbis.dll")
self.path("libvorbisfile.dll")
# Misc # Misc
self.path("libexpat.dll") self.path("libexpat.dll")
self.path("libxml2.dll") self.path("libxml2.dll")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment