Index: ps/trunk/binaries/system/ogg.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/ogg.dll =================================================================== --- ps/trunk/binaries/system/ogg.dll (revision 22405) +++ ps/trunk/binaries/system/ogg.dll (nonexistent) Property changes on: ps/trunk/binaries/system/ogg.dll ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/ogg_d.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/ogg_d.dll =================================================================== --- ps/trunk/binaries/system/ogg_d.dll (revision 22405) +++ ps/trunk/binaries/system/ogg_d.dll (nonexistent) Property changes on: ps/trunk/binaries/system/ogg_d.dll ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/vorbisfile.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/vorbisfile.dll =================================================================== --- ps/trunk/binaries/system/vorbisfile.dll (revision 22405) +++ ps/trunk/binaries/system/vorbisfile.dll (nonexistent) Property changes on: ps/trunk/binaries/system/vorbisfile.dll ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/vorbis_d.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/vorbis_d.dll =================================================================== --- ps/trunk/binaries/system/vorbis_d.dll (revision 22405) +++ ps/trunk/binaries/system/vorbis_d.dll (nonexistent) Property changes on: ps/trunk/binaries/system/vorbis_d.dll ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/vorbis.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/vorbis.dll =================================================================== --- ps/trunk/binaries/system/vorbis.dll (revision 22405) +++ ps/trunk/binaries/system/vorbis.dll (nonexistent) Property changes on: ps/trunk/binaries/system/vorbis.dll ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/vorbisfile_d.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/vorbisfile_d.dll =================================================================== --- ps/trunk/binaries/system/vorbisfile_d.dll (revision 22405) +++ ps/trunk/binaries/system/vorbisfile_d.dll (nonexistent) Property changes on: ps/trunk/binaries/system/vorbisfile_d.dll ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/vorbisfile_d.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/vorbisfile_d.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/vorbisfile_d.lib (revision 22405) +++ ps/trunk/libraries/win32/vorbis/lib/vorbisfile_d.lib (nonexistent) Property changes on: ps/trunk/libraries/win32/vorbis/lib/vorbisfile_d.lib ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/ogg.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/ogg.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/ogg.lib (revision 22405) +++ ps/trunk/libraries/win32/vorbis/lib/ogg.lib (nonexistent) Property changes on: ps/trunk/libraries/win32/vorbis/lib/ogg.lib ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/vorbis_d.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/vorbis_d.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/vorbis_d.lib (revision 22405) +++ ps/trunk/libraries/win32/vorbis/lib/vorbis_d.lib (nonexistent) Property changes on: ps/trunk/libraries/win32/vorbis/lib/vorbis_d.lib ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/vorbisfile.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/vorbisfile.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/vorbisfile.lib (revision 22405) +++ ps/trunk/libraries/win32/vorbis/lib/vorbisfile.lib (nonexistent) Property changes on: ps/trunk/libraries/win32/vorbis/lib/vorbisfile.lib ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/vorbis.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/vorbis.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/vorbis.lib (revision 22405) +++ ps/trunk/libraries/win32/vorbis/lib/vorbis.lib (nonexistent) Property changes on: ps/trunk/libraries/win32/vorbis/lib/vorbis.lib ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/ogg_d.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/ogg_d.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/ogg_d.lib (revision 22405) +++ ps/trunk/libraries/win32/vorbis/lib/ogg_d.lib (nonexistent) Property changes on: ps/trunk/libraries/win32/vorbis/lib/ogg_d.lib ___________________________________________________________________ Deleted: svn:mime-type ## -1 +0,0 ## -application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/libogg.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/libogg.dll =================================================================== --- ps/trunk/binaries/system/libogg.dll (nonexistent) +++ ps/trunk/binaries/system/libogg.dll (revision 22406) Property changes on: ps/trunk/binaries/system/libogg.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/liboggd.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/liboggd.dll =================================================================== --- ps/trunk/binaries/system/liboggd.dll (nonexistent) +++ ps/trunk/binaries/system/liboggd.dll (revision 22406) Property changes on: ps/trunk/binaries/system/liboggd.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/libvorbis.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/libvorbis.dll =================================================================== --- ps/trunk/binaries/system/libvorbis.dll (nonexistent) +++ ps/trunk/binaries/system/libvorbis.dll (revision 22406) Property changes on: ps/trunk/binaries/system/libvorbis.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/libvorbisd.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/libvorbisd.dll =================================================================== --- ps/trunk/binaries/system/libvorbisd.dll (nonexistent) +++ ps/trunk/binaries/system/libvorbisd.dll (revision 22406) Property changes on: ps/trunk/binaries/system/libvorbisd.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/libvorbisfile.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/libvorbisfile.dll =================================================================== --- ps/trunk/binaries/system/libvorbisfile.dll (nonexistent) +++ ps/trunk/binaries/system/libvorbisfile.dll (revision 22406) Property changes on: ps/trunk/binaries/system/libvorbisfile.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/system/libvorbisfiled.dll =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/system/libvorbisfiled.dll =================================================================== --- ps/trunk/binaries/system/libvorbisfiled.dll (nonexistent) +++ ps/trunk/binaries/system/libvorbisfiled.dll (revision 22406) Property changes on: ps/trunk/binaries/system/libvorbisfiled.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/build/premake/extern_libs5.lua =================================================================== --- ps/trunk/build/premake/extern_libs5.lua (revision 22405) +++ ps/trunk/build/premake/extern_libs5.lua (revision 22406) @@ -1,712 +1,711 @@ -- this file provides project_add_extern_libs, which takes care of the -- dirty details of adding the libraries' include and lib paths. -- -- TYPICAL TASK: add new library. Instructions: -- 1) add a new extern_lib_defs entry -- 2) add library name to extern_libs tables in premake.lua for all 'projects' that want to use it -- directory in which OS-specific library subdirectories reside. if os.istarget("macosx") then libraries_dir = rootdir.."/libraries/osx/" elseif os.istarget("windows") then libraries_dir = rootdir.."/libraries/win32/" else -- No Unix-specific libs yet (use source directory instead!) end -- directory for shared, bundled libraries libraries_source_dir = rootdir.."/libraries/source/" third_party_source_dir = rootdir.."/source/third_party/" local function add_default_lib_paths(extern_lib) libdirs { libraries_dir .. extern_lib .. "/lib" } end local function add_source_lib_paths(extern_lib) libdirs { libraries_source_dir .. extern_lib .. "/lib" } end local function add_default_include_paths(extern_lib) sysincludedirs { libraries_dir .. extern_lib .. "/include" } end local function add_source_include_paths(extern_lib) sysincludedirs { libraries_source_dir .. extern_lib .. "/include" } end local function add_third_party_include_paths(extern_lib) sysincludedirs { third_party_source_dir .. extern_lib .. "/include" } end pkgconfig = require "pkgconfig" local function add_delayload(name, suffix, def) if def["no_delayload"] then return end -- currently only supported by VC; nothing to do on other platforms. if not os.istarget("windows") then return end -- no extra debug version; use same library in all configs if suffix == "" then linkoptions { "/DELAYLOAD:"..name..".dll" } -- extra debug version available; use in debug config else local dbg_cmd = "/DELAYLOAD:" .. name .. suffix .. ".dll" local cmd = "/DELAYLOAD:" .. name .. ".dll" filter "Debug" linkoptions { dbg_cmd } filter "Release" linkoptions { cmd } filter { } end end local function add_default_links(def) -- careful: make sure to only use *_names when on the correct platform. local names = {} if os.istarget("windows") then if def.win_names then names = def.win_names end elseif _OPTIONS["android"] and def.android_names then names = def.android_names elseif os.istarget("linux") and def.linux_names then names = def.linux_names elseif os.istarget("macosx") and (def.osx_names or def.osx_frameworks) then if def.osx_names then names = def.osx_names end -- OS X "Frameworks" are added to the links as "name.framework" if def.osx_frameworks then for i,name in pairs(def.osx_frameworks) do links { name .. ".framework" } end end elseif os.istarget("bsd") and def.bsd_names then names = def.bsd_names elseif def.unix_names then names = def.unix_names end local suffix = "d" -- library is overriding default suffix (typically "" to indicate there is none) if def["dbg_suffix"] then suffix = def["dbg_suffix"] end -- non-Windows doesn't have the distinction of debug vs. release libraries -- (to be more specific, they do, but the two are binary compatible; -- usually only one type - debug or release - is installed at a time). if not os.istarget("windows") then suffix = "" end for i,name in pairs(names) do filter "Debug" links { name .. suffix } filter "Release" links { name } filter { } add_delayload(name, suffix, def) end end -- Library definitions -- In a perfect world, libraries would have a common installation template, -- i.e. location of include directory, naming convention for .lib, etc. -- this table provides a means of working around each library's differences. -- -- The basic approach is defining two functions per library: -- -- 1. compile_settings -- This function should set all settings requred during the compile-phase like -- includedirs, defines etc... -- -- 2. link_settings -- This function should set all settings required during the link-phase like -- libdirs, linkflag etc... -- -- The main reason for separating those settings is different linking behaviour -- on osx and xcode. For more details, read the comment in project_add_extern_libs. -- -- There are some helper functions for the most common tasks. You should use them -- if they can be used in your situation to make the definitions more consistent and -- use their default beviours as a guideline. -- -- -- add_default_lib_paths(extern_lib) -- Description: Add '//lib'to the libpaths -- Parameters: -- * extern_lib: to be used in the libpath. -- -- add_default_include_paths(extern_lib) -- Description: Add '//include' to the includepaths -- Parameters: -- * extern_lib: to be used in the libpath. -- -- add_default_links -- Description: Adds links to libraries and configures delayloading. -- If the *_names parameter for a plattform is missing, no linking will be done -- on that plattform. -- The default assumptions are: -- * debug import library and DLL are distinguished with a "d" suffix -- * the library should be marked for delay-loading. -- Parameters: -- * win_names: table of import library / DLL names (no extension) when -- running on Windows. -- * unix_names: as above; shared object names when running on non-Windows. -- * osx_names, osx_frameworks: for OS X specifically; if any of those is -- specified, unix_names is ignored. Using both is possible if needed. -- * osx_names: as above. -- * osx_frameworks: as above, for system libraries that need to be linked -- as "name.framework". -- * bsd_names: as above; for BSD specifically (overrides unix_names if both are -- specified) -- * linux_names: ditto for Linux (overrides unix_names if both given) -- * dbg_suffix: changes the debug suffix from the above default. -- can be "" to indicate the library doesn't have a debug build; -- in that case, the same library (without suffix) is used in -- all build configurations. -- * no_delayload: indicate the library is not to be delay-loaded. -- this is necessary for some libraries that do not support it, -- e.g. Xerces (which is so stupid as to export variables). extern_lib_defs = { boost = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("boost") elseif os.istarget("macosx") then -- Suppress all the Boost warnings on OS X by including it as a system directory buildoptions { "-isystem../" .. libraries_dir .. "boost/include" } end -- TODO: This actually applies to most libraries we use on BSDs, make this a global setting. if os.istarget("bsd") then sysincludedirs { "/usr/local/include" } end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("boost") end add_default_links({ -- The following are not strictly link dependencies on all systems, but -- are included for compatibility with different versions of Boost android_names = { "boost_filesystem-gcc-mt", "boost_system-gcc-mt" }, unix_names = { os.findlib("boost_filesystem-mt") and "boost_filesystem-mt" or "boost_filesystem", os.findlib("boost_system-mt") and "boost_system-mt" or "boost_system" }, osx_names = { "boost_filesystem-mt", "boost_system-mt" }, }) end, }, comsuppw = { link_settings = function() add_default_links({ win_names = { "comsuppw" }, dbg_suffix = "d", no_delayload = 1, }) end, }, cxxtest = { compile_settings = function() sysincludedirs { libraries_source_dir .. "cxxtest-4.4" } end, }, enet = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("enet") end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("enet") end add_default_links({ win_names = { "enet" }, unix_names = { "enet" }, }) end, }, fcollada = { compile_settings = function() add_source_include_paths("fcollada") end, link_settings = function() add_source_lib_paths("fcollada") if os.istarget("windows") then filter "Debug" links { "FColladaD" } filter "Release" links { "FCollada" } filter { } else filter "Debug" links { "FColladaSD" } filter "Release" links { "FColladaSR" } filter { } end end, }, gloox = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("gloox") else -- Support GLOOX_CONFIG for overriding the default (pkg-config --cflags gloox) -- i.e. on OSX where it gets set in update-workspaces.sh pkgconfig.add_includes("gloox", os.getenv("GLOOX_CONFIG")) end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("gloox") add_default_links({ win_names = { "gloox-1.0" }, no_delayload = 1, }) else pkgconfig.add_links("gloox", os.getenv("GLOOX_CONFIG")) if os.istarget("macosx") then -- Manually add gnutls dependencies, those are not present in gloox's pkg-config add_default_lib_paths("nettle") add_default_lib_paths("gmp") add_default_links({ osx_names = { "nettle", "hogweed", "gmp" }, }) end end end, }, iconv = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("iconv") defines { "HAVE_ICONV_CONST" } defines { "ICONV_CONST=const" } defines { "LIBICONV_STATIC" } elseif os.istarget("macosx") then add_default_include_paths("iconv") defines { "LIBICONV_STATIC" } elseif os.getversion().description == "FreeBSD" then defines { "HAVE_ICONV_CONST" } defines { "ICONV_CONST=const" } end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("iconv") end add_default_links({ win_names = { "libiconv" }, osx_names = { "iconv" }, dbg_suffix = "", no_delayload = 1, }) -- glibc (used on Linux and GNU/kFreeBSD) has iconv -- FreeBSD 10+ has iconv as a part of libc if os.istarget("bsd") and not (os.getversion().description == "FreeBSD" and os.getversion().majorversion >= 10 or os.getversion().description == "GNU/kFreeBSD") then add_default_links({ bsd_names = { "iconv" }, }) end end, }, icu = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("icu") else -- Support ICU_CONFIG for overriding the default (pkg-config --cflags icu-i18n) -- i.e. on OSX where it gets set in update-workspaces.sh pkgconfig.add_includes("icu-i18n", os.getenv("ICU_CONFIG"), "--cppflags") end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("icu") add_default_links({ win_names = { "icuuc", "icuin" }, dbg_suffix = "", no_delayload = 1, }) else pkgconfig.add_links("icu-i18n", os.getenv("ICU_CONFIG"), "--ldflags-searchpath --ldflags-libsonly --ldflags-system") end end, }, libcurl = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("libcurl") end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("libcurl") end add_default_links({ win_names = { "libcurl" }, unix_names = { "curl" }, osx_names = { "curl", "z" }, osx_frameworks = { "Security" } }) end, }, libpng = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("libpng") end if os.getversion().description == "OpenBSD" then sysincludedirs { "/usr/local/include/libpng" } end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("libpng") end add_default_links({ win_names = { "libpng16" }, unix_names = { "png" }, -- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/ -- TODO: Figure out why that happens osx_names = { "png16" }, }) end, }, libsodium = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("libsodium") end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("libsodium") end add_default_links({ win_names = { "libsodium" }, unix_names = { "sodium" }, }) end, }, libxml2 = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("libxml2") else -- Support XML2_CONFIG for overriding the default (pkg-config --cflags libxml-2.0) -- i.e. on OSX where it gets set in update-workspaces.sh pkgconfig.add_includes("libxml-2.0", os.getenv("XML2_CONFIG")) end if os.istarget("macosx") then -- libxml2 needs _REENTRANT or __MT__ for thread support; -- OS X doesn't get either set by default, so do it manually defines { "_REENTRANT" } end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("libxml2") filter "Debug" links { "libxml2" } filter "Release" links { "libxml2" } filter { } else pkgconfig.add_links("libxml-2.0", os.getenv("XML2_CONFIG")) end end, }, miniupnpc = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("miniupnpc") end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("miniupnpc") end add_default_links({ win_names = { "miniupnpc" }, unix_names = { "miniupnpc" }, }) end, }, nvtt = { compile_settings = function() if not _OPTIONS["with-system-nvtt"] then add_source_include_paths("nvtt") end defines { "NVTT_SHARED=1" } end, link_settings = function() if not _OPTIONS["with-system-nvtt"] then add_source_lib_paths("nvtt") end add_default_links({ win_names = { "nvtt" }, unix_names = { "nvcore", "nvmath", "nvimage", "nvtt" }, osx_names = { "nvcore", "nvmath", "nvimage", "nvtt", "squish" }, dbg_suffix = "", -- for performance we always use the release-mode version }) end, }, openal = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("openal") end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("openal") end add_default_links({ win_names = { "openal32" }, unix_names = { "openal" }, osx_frameworks = { "OpenAL" }, dbg_suffix = "", no_delayload = 1, -- delayload seems to cause errors on startup }) end, }, opengl = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("opengl") end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("opengl") end if _OPTIONS["gles"] then add_default_links({ unix_names = { "GLESv2" }, dbg_suffix = "", }) else add_default_links({ win_names = { "opengl32", "gdi32" }, unix_names = { "GL" }, osx_frameworks = { "OpenGL" }, dbg_suffix = "", no_delayload = 1, -- delayload seems to cause errors on startup }) end end, }, sdl = { compile_settings = function() if os.istarget("windows") then includedirs { libraries_dir .. "sdl2/include/SDL" } elseif not _OPTIONS["android"] then -- Support SDL2_CONFIG for overriding the default (pkg-config sdl2) -- i.e. on OSX where it gets set in update-workspaces.sh pkgconfig.add_includes("sdl2", os.getenv("SDL2_CONFIG")) end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("sdl2") elseif not _OPTIONS["android"] then pkgconfig.add_links("sdl2", os.getenv("SDL2_CONFIG")) end end, }, spidermonkey = { compile_settings = function() if _OPTIONS["with-system-mozjs38"] then if not _OPTIONS["android"] then pkgconfig.add_includes("mozjs-38") end else if os.istarget("windows") then include_dir = "include-win32" buildoptions { "/FI\"js/RequiredDefines.h\"" } else include_dir = "include-unix" end filter "Debug" sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-debug" } defines { "DEBUG" } filter "Release" sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-release" } filter { } end end, link_settings = function() if _OPTIONS["with-system-mozjs38"] then if _OPTIONS["android"] then links { "mozjs-38" } else pkgconfig.add_links("nspr") pkgconfig.add_links("mozjs-38") end else if os.istarget("macosx") then add_default_lib_paths("nspr") links { "nspr4", "plc4", "plds4" } end filter { "Debug", "action:vs2013" } links { "mozjs38-ps-debug-vc120" } filter { "Release", "action:vs2013" } links { "mozjs38-ps-release-vc120" } filter { "Debug", "action:vs2015" } links { "mozjs38-ps-debug-vc140" } filter { "Release", "action:vs2015" } links { "mozjs38-ps-release-vc140" } filter { "Debug", "action:not vs*" } links { "mozjs38-ps-debug" } filter { "Release", "action:not vs*" } links { "mozjs38-ps-release" } filter { } add_source_lib_paths("spidermonkey") end end, }, tinygettext = { compile_settings = function() add_third_party_include_paths("tinygettext") end, }, valgrind = { compile_settings = function() add_source_include_paths("valgrind") end, }, vorbis = { compile_settings = function() if os.istarget("windows") then add_default_include_paths("vorbis") elseif os.istarget("macosx") then add_default_include_paths("libogg") add_default_include_paths("vorbis") end end, link_settings = function() if os.istarget("windows") then add_default_lib_paths("vorbis") elseif os.istarget("macosx") then add_default_lib_paths("libogg") add_default_lib_paths("vorbis") end -- TODO: We need to force linking with these as currently -- they need to be loaded explicitly on execution if os.getversion().description == "OpenBSD" then add_default_links({ unix_names = { "ogg", "vorbis" }, }) end add_default_links({ - win_names = { "vorbisfile" }, + win_names = { "libvorbisfile" }, unix_names = { "vorbisfile" }, osx_names = { "vorbis", "vorbisenc", "vorbisfile", "ogg" }, - dbg_suffix = "_d", }) end, }, wxwidgets = { compile_settings = function() if os.istarget("windows") then includedirs { libraries_dir.."wxwidgets/include/msvc" } add_default_include_paths("wxwidgets") else -- wxwidgets does not come with a definition file for pkg-config, -- so we have to use wxwidgets' own config tool wx_config_path = os.getenv("WX_CONFIG") or "wx-config" pkgconfig.add_includes(nil, wx_config_path, "--unicode=yes --cxxflags") end end, link_settings = function() if os.istarget("windows") then libdirs { libraries_dir.."wxwidgets/lib/vc_lib" } else wx_config_path = os.getenv("WX_CONFIG") or "wx-config" pkgconfig.add_links(nil, wx_config_path, "--unicode=yes --libs std,gl") end end, }, x11 = { compile_settings = function() if not os.istarget("windows") and not os.istarget("macosx") then pkgconfig.add_includes("x11") end end, link_settings = function() if not os.istarget("windows") and not os.istarget("macosx") then pkgconfig.add_links("x11") end end, }, xcursor = { link_settings = function() add_default_links({ unix_names = { "Xcursor" }, }) end, }, zlib = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("zlib") end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("zlib") end add_default_links({ win_names = { "zlib1" }, unix_names = { "z" }, no_delayload = 1, }) end, }, } -- add a set of external libraries to the project; takes care of -- include / lib path and linking against the import library. -- extern_libs: table of library names [string] -- target_type: String defining the projects kind [string] function project_add_extern_libs(extern_libs, target_type) for i,extern_lib in pairs(extern_libs) do local def = extern_lib_defs[extern_lib] assert(def, "external library " .. extern_lib .. " not defined") if def.compile_settings then def.compile_settings() end -- Linking to external libraries will only be done in the main executable and not in the -- static libraries. Premake would silently skip linking into static libraries for some -- actions anyway (e.g. vs2010). -- On osx using xcode, if this linking would be defined in the static libraries, it would fail to -- link if only dylibs are available. If both *.a and *.dylib are available, it would link statically. -- I couldn't find any problems with that approach. if target_type ~= "StaticLib" and def.link_settings then def.link_settings() end end end Index: ps/trunk/libraries/win32/vorbis/include/ogg/ogg.h =================================================================== --- ps/trunk/libraries/win32/vorbis/include/ogg/ogg.h (revision 22405) +++ ps/trunk/libraries/win32/vorbis/include/ogg/ogg.h (revision 22406) @@ -1,210 +1,210 @@ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: toplevel libogg include - last mod: $Id: ogg.h 18044 2011-08-01 17:55:20Z gmaxwell $ + last mod: $Id$ ********************************************************************/ #ifndef _OGG_H #define _OGG_H #ifdef __cplusplus extern "C" { #endif #include #include typedef struct { void *iov_base; size_t iov_len; } ogg_iovec_t; typedef struct { long endbyte; int endbit; unsigned char *buffer; unsigned char *ptr; long storage; } oggpack_buffer; /* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/ typedef struct { unsigned char *header; long header_len; unsigned char *body; long body_len; } ogg_page; /* ogg_stream_state contains the current encode/decode state of a logical Ogg bitstream **********************************************************/ typedef struct { unsigned char *body_data; /* bytes from packet bodies */ long body_storage; /* storage elements allocated */ long body_fill; /* elements stored; fill mark */ long body_returned; /* elements of fill returned */ int *lacing_vals; /* The values that will go to the segment table */ ogg_int64_t *granule_vals; /* granulepos values for headers. Not compact this way, but it is simple coupled to the lacing fifo */ long lacing_storage; long lacing_fill; long lacing_packet; long lacing_returned; unsigned char header[282]; /* working space for header encode */ int header_fill; int e_o_s; /* set when we have buffered the last packet in the logical bitstream */ int b_o_s; /* set after we've written the initial page of a logical bitstream */ long serialno; long pageno; ogg_int64_t packetno; /* sequence number for decode; the framing knows where there's a hole in the data, but we need coupling so that the codec (which is in a separate abstraction layer) also knows about the gap */ ogg_int64_t granulepos; } ogg_stream_state; /* ogg_packet is used to encapsulate the data and metadata belonging to a single raw Ogg/Vorbis packet *************************************/ typedef struct { unsigned char *packet; long bytes; long b_o_s; long e_o_s; ogg_int64_t granulepos; ogg_int64_t packetno; /* sequence number for decode; the framing knows where there's a hole in the data, but we need coupling so that the codec (which is in a separate abstraction layer) also knows about the gap */ } ogg_packet; typedef struct { unsigned char *data; int storage; int fill; int returned; int unsynced; int headerbytes; int bodybytes; } ogg_sync_state; /* Ogg BITSTREAM PRIMITIVES: bitstream ************************/ extern void oggpack_writeinit(oggpack_buffer *b); extern int oggpack_writecheck(oggpack_buffer *b); extern void oggpack_writetrunc(oggpack_buffer *b,long bits); extern void oggpack_writealign(oggpack_buffer *b); extern void oggpack_writecopy(oggpack_buffer *b,void *source,long bits); extern void oggpack_reset(oggpack_buffer *b); extern void oggpack_writeclear(oggpack_buffer *b); extern void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes); extern void oggpack_write(oggpack_buffer *b,unsigned long value,int bits); extern long oggpack_look(oggpack_buffer *b,int bits); extern long oggpack_look1(oggpack_buffer *b); extern void oggpack_adv(oggpack_buffer *b,int bits); extern void oggpack_adv1(oggpack_buffer *b); extern long oggpack_read(oggpack_buffer *b,int bits); extern long oggpack_read1(oggpack_buffer *b); extern long oggpack_bytes(oggpack_buffer *b); extern long oggpack_bits(oggpack_buffer *b); extern unsigned char *oggpack_get_buffer(oggpack_buffer *b); extern void oggpackB_writeinit(oggpack_buffer *b); extern int oggpackB_writecheck(oggpack_buffer *b); extern void oggpackB_writetrunc(oggpack_buffer *b,long bits); extern void oggpackB_writealign(oggpack_buffer *b); extern void oggpackB_writecopy(oggpack_buffer *b,void *source,long bits); extern void oggpackB_reset(oggpack_buffer *b); extern void oggpackB_writeclear(oggpack_buffer *b); extern void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes); extern void oggpackB_write(oggpack_buffer *b,unsigned long value,int bits); extern long oggpackB_look(oggpack_buffer *b,int bits); extern long oggpackB_look1(oggpack_buffer *b); extern void oggpackB_adv(oggpack_buffer *b,int bits); extern void oggpackB_adv1(oggpack_buffer *b); extern long oggpackB_read(oggpack_buffer *b,int bits); extern long oggpackB_read1(oggpack_buffer *b); extern long oggpackB_bytes(oggpack_buffer *b); extern long oggpackB_bits(oggpack_buffer *b); extern unsigned char *oggpackB_get_buffer(oggpack_buffer *b); /* Ogg BITSTREAM PRIMITIVES: encoding **************************/ extern int ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op); extern int ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov, int count, long e_o_s, ogg_int64_t granulepos); extern int ogg_stream_pageout(ogg_stream_state *os, ogg_page *og); extern int ogg_stream_pageout_fill(ogg_stream_state *os, ogg_page *og, int nfill); extern int ogg_stream_flush(ogg_stream_state *os, ogg_page *og); extern int ogg_stream_flush_fill(ogg_stream_state *os, ogg_page *og, int nfill); /* Ogg BITSTREAM PRIMITIVES: decoding **************************/ extern int ogg_sync_init(ogg_sync_state *oy); extern int ogg_sync_clear(ogg_sync_state *oy); extern int ogg_sync_reset(ogg_sync_state *oy); extern int ogg_sync_destroy(ogg_sync_state *oy); extern int ogg_sync_check(ogg_sync_state *oy); extern char *ogg_sync_buffer(ogg_sync_state *oy, long size); extern int ogg_sync_wrote(ogg_sync_state *oy, long bytes); extern long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og); extern int ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og); extern int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og); extern int ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op); extern int ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op); /* Ogg BITSTREAM PRIMITIVES: general ***************************/ extern int ogg_stream_init(ogg_stream_state *os,int serialno); extern int ogg_stream_clear(ogg_stream_state *os); extern int ogg_stream_reset(ogg_stream_state *os); extern int ogg_stream_reset_serialno(ogg_stream_state *os,int serialno); extern int ogg_stream_destroy(ogg_stream_state *os); extern int ogg_stream_check(ogg_stream_state *os); extern int ogg_stream_eos(ogg_stream_state *os); extern void ogg_page_checksum_set(ogg_page *og); extern int ogg_page_version(const ogg_page *og); extern int ogg_page_continued(const ogg_page *og); extern int ogg_page_bos(const ogg_page *og); extern int ogg_page_eos(const ogg_page *og); extern ogg_int64_t ogg_page_granulepos(const ogg_page *og); extern int ogg_page_serialno(const ogg_page *og); extern long ogg_page_pageno(const ogg_page *og); extern int ogg_page_packets(const ogg_page *og); extern void ogg_packet_clear(ogg_packet *op); #ifdef __cplusplus } #endif #endif /* _OGG_H */ Index: ps/trunk/libraries/win32/vorbis/include/ogg/os_types.h =================================================================== --- ps/trunk/libraries/win32/vorbis/include/ogg/os_types.h (revision 22405) +++ ps/trunk/libraries/win32/vorbis/include/ogg/os_types.h (revision 22406) @@ -1,147 +1,148 @@ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $ + last mod: $Id$ ********************************************************************/ #ifndef _OS_TYPES_H #define _OS_TYPES_H /* make it easy on the folks that want to compile the libs with a different malloc than stdlib */ #define _ogg_malloc malloc #define _ogg_calloc calloc #define _ogg_realloc realloc #define _ogg_free free #if defined(_WIN32) # if defined(__CYGWIN__) # include typedef int16_t ogg_int16_t; typedef uint16_t ogg_uint16_t; typedef int32_t ogg_int32_t; typedef uint32_t ogg_uint32_t; typedef int64_t ogg_int64_t; typedef uint64_t ogg_uint64_t; # elif defined(__MINGW32__) # include typedef short ogg_int16_t; typedef unsigned short ogg_uint16_t; typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; typedef unsigned long long ogg_uint64_t; # elif defined(__MWERKS__) typedef long long ogg_int64_t; typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef short ogg_int16_t; typedef unsigned short ogg_uint16_t; # else - /* MSVC/Borland */ - typedef __int64 ogg_int64_t; - typedef __int32 ogg_int32_t; - typedef unsigned __int32 ogg_uint32_t; - typedef __int16 ogg_int16_t; - typedef unsigned __int16 ogg_uint16_t; +# if defined(_MSC_VER) && (_MSC_VER >= 1800) /* MSVC 2013 and newer */ +# include + typedef int16_t ogg_int16_t; + typedef uint16_t ogg_uint16_t; + typedef int32_t ogg_int32_t; + typedef uint32_t ogg_uint32_t; + typedef int64_t ogg_int64_t; + typedef uint64_t ogg_uint64_t; +# else + /* MSVC/Borland */ + typedef __int64 ogg_int64_t; + typedef __int32 ogg_int32_t; + typedef unsigned __int32 ogg_uint32_t; + typedef __int16 ogg_int16_t; + typedef unsigned __int16 ogg_uint16_t; +# endif # endif -#elif defined(__MACOS__) - -# include - typedef SInt16 ogg_int16_t; - typedef UInt16 ogg_uint16_t; - typedef SInt32 ogg_int32_t; - typedef UInt32 ogg_uint32_t; - typedef SInt64 ogg_int64_t; - #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ # include typedef int16_t ogg_int16_t; typedef uint16_t ogg_uint16_t; typedef int32_t ogg_int32_t; typedef uint32_t ogg_uint32_t; typedef int64_t ogg_int64_t; #elif defined(__HAIKU__) /* Haiku */ # include typedef short ogg_int16_t; typedef unsigned short ogg_uint16_t; typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; #elif defined(__BEOS__) /* Be */ # include typedef int16_t ogg_int16_t; typedef uint16_t ogg_uint16_t; typedef int32_t ogg_int32_t; typedef uint32_t ogg_uint32_t; typedef int64_t ogg_int64_t; #elif defined (__EMX__) /* OS/2 GCC */ typedef short ogg_int16_t; typedef unsigned short ogg_uint16_t; typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; #elif defined (DJGPP) /* DJGPP */ typedef short ogg_int16_t; typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; #elif defined(R5900) /* PS2 EE */ typedef long ogg_int64_t; typedef int ogg_int32_t; typedef unsigned ogg_uint32_t; typedef short ogg_int16_t; #elif defined(__SYMBIAN32__) /* Symbian GCC */ typedef signed short ogg_int16_t; typedef unsigned short ogg_uint16_t; typedef signed int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long int ogg_int64_t; #elif defined(__TMS320C6X__) /* TI C64x compiler */ typedef signed short ogg_int16_t; typedef unsigned short ogg_uint16_t; typedef signed int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long int ogg_int64_t; #else # include #endif #endif /* _OS_TYPES_H */ Index: ps/trunk/libraries/win32/vorbis/include/vorbis/codec.h =================================================================== --- ps/trunk/libraries/win32/vorbis/include/vorbis/codec.h (revision 22405) +++ ps/trunk/libraries/win32/vorbis/include/vorbis/codec.h (revision 22406) @@ -1,243 +1,242 @@ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * * by the Xiph.Org Foundation http://www.xiph.org/ * ******************************************************************** function: libvorbis codec headers - last mod: $Id: codec.h 17021 2010-03-24 09:29:41Z xiphmont $ ********************************************************************/ #ifndef _vorbis_codec_h_ #define _vorbis_codec_h_ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #include typedef struct vorbis_info{ int version; int channels; long rate; /* The below bitrate declarations are *hints*. Combinations of the three values carry the following implications: all three set to the same value: implies a fixed rate bitstream only nominal set: implies a VBR stream that averages the nominal bitrate. No hard upper/lower limit upper and or lower set: implies a VBR bitstream that obeys the bitrate limits. nominal may also be set to give a nominal rate. none set: the coder does not care to speculate. */ long bitrate_upper; long bitrate_nominal; long bitrate_lower; long bitrate_window; void *codec_setup; } vorbis_info; /* vorbis_dsp_state buffers the current vorbis audio analysis/synthesis state. The DSP state belongs to a specific logical bitstream ****************************************************/ typedef struct vorbis_dsp_state{ int analysisp; vorbis_info *vi; float **pcm; float **pcmret; int pcm_storage; int pcm_current; int pcm_returned; int preextrapolate; int eofflag; long lW; long W; long nW; long centerW; ogg_int64_t granulepos; ogg_int64_t sequence; ogg_int64_t glue_bits; ogg_int64_t time_bits; ogg_int64_t floor_bits; ogg_int64_t res_bits; void *backend_state; } vorbis_dsp_state; typedef struct vorbis_block{ /* necessary stream state for linking to the framing abstraction */ float **pcm; /* this is a pointer into local storage */ oggpack_buffer opb; long lW; long W; long nW; int pcmend; int mode; int eofflag; ogg_int64_t granulepos; ogg_int64_t sequence; vorbis_dsp_state *vd; /* For read-only access of configuration */ /* local storage to avoid remallocing; it's up to the mapping to structure it */ void *localstore; long localtop; long localalloc; long totaluse; struct alloc_chain *reap; /* bitmetrics for the frame */ long glue_bits; long time_bits; long floor_bits; long res_bits; void *internal; } vorbis_block; /* vorbis_block is a single block of data to be processed as part of the analysis/synthesis stream; it belongs to a specific logical bitstream, but is independent from other vorbis_blocks belonging to that logical bitstream. *************************************************/ struct alloc_chain{ void *ptr; struct alloc_chain *next; }; /* vorbis_info contains all the setup information specific to the specific compression/decompression mode in progress (eg, psychoacoustic settings, channel setup, options, codebook etc). vorbis_info and substructures are in backends.h. *********************************************************************/ /* the comments are not part of vorbis_info so that vorbis_info can be static storage */ typedef struct vorbis_comment{ /* unlimited user comment fields. libvorbis writes 'libvorbis' whatever vendor is set to in encode */ char **user_comments; int *comment_lengths; int comments; char *vendor; } vorbis_comment; /* libvorbis encodes in two abstraction layers; first we perform DSP and produce a packet (see docs/analysis.txt). The packet is then coded into a framed OggSquish bitstream by the second layer (see docs/framing.txt). Decode is the reverse process; we sync/frame the bitstream and extract individual packets, then decode the packet back into PCM audio. The extra framing/packetizing is used in streaming formats, such as files. Over the net (such as with UDP), the framing and packetization aren't necessary as they're provided by the transport and the streaming layer is not used */ /* Vorbis PRIMITIVES: general ***************************************/ extern void vorbis_info_init(vorbis_info *vi); extern void vorbis_info_clear(vorbis_info *vi); extern int vorbis_info_blocksize(vorbis_info *vi,int zo); extern void vorbis_comment_init(vorbis_comment *vc); extern void vorbis_comment_add(vorbis_comment *vc, const char *comment); extern void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, const char *contents); extern char *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count); extern int vorbis_comment_query_count(vorbis_comment *vc, const char *tag); extern void vorbis_comment_clear(vorbis_comment *vc); extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); extern int vorbis_block_clear(vorbis_block *vb); extern void vorbis_dsp_clear(vorbis_dsp_state *v); extern double vorbis_granule_time(vorbis_dsp_state *v, ogg_int64_t granulepos); extern const char *vorbis_version_string(void); /* Vorbis PRIMITIVES: analysis/DSP layer ****************************/ extern int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi); extern int vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op); extern int vorbis_analysis_headerout(vorbis_dsp_state *v, vorbis_comment *vc, ogg_packet *op, ogg_packet *op_comm, ogg_packet *op_code); extern float **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals); extern int vorbis_analysis_wrote(vorbis_dsp_state *v,int vals); extern int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb); extern int vorbis_analysis(vorbis_block *vb,ogg_packet *op); extern int vorbis_bitrate_addblock(vorbis_block *vb); extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ogg_packet *op); /* Vorbis PRIMITIVES: synthesis layer *******************************/ extern int vorbis_synthesis_idheader(ogg_packet *op); extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ogg_packet *op); extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); extern int vorbis_synthesis_restart(vorbis_dsp_state *v); extern int vorbis_synthesis(vorbis_block *vb,ogg_packet *op); extern int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op); extern int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb); extern int vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm); extern int vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm); extern int vorbis_synthesis_read(vorbis_dsp_state *v,int samples); extern long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op); extern int vorbis_synthesis_halfrate(vorbis_info *v,int flag); extern int vorbis_synthesis_halfrate_p(vorbis_info *v); /* Vorbis ERRORS and return codes ***********************************/ #define OV_FALSE -1 #define OV_EOF -2 #define OV_HOLE -3 #define OV_EREAD -128 #define OV_EFAULT -129 #define OV_EIMPL -130 #define OV_EINVAL -131 #define OV_ENOTVORBIS -132 #define OV_EBADHEADER -133 #define OV_EVERSION -134 #define OV_ENOTAUDIO -135 #define OV_EBADPACKET -136 #define OV_EBADLINK -137 #define OV_ENOSEEK -138 #ifdef __cplusplus } #endif /* __cplusplus */ #endif Index: ps/trunk/libraries/win32/vorbis/include/vorbis/vorbisenc.h =================================================================== --- ps/trunk/libraries/win32/vorbis/include/vorbis/vorbisenc.h (revision 22405) +++ ps/trunk/libraries/win32/vorbis/include/vorbis/vorbisenc.h (revision 22406) @@ -1,436 +1,435 @@ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: vorbis encode-engine setup - last mod: $Id: vorbisenc.h 17021 2010-03-24 09:29:41Z xiphmont $ ********************************************************************/ /** \file * Libvorbisenc is a convenient API for setting up an encoding * environment using libvorbis. Libvorbisenc encapsulates the * actions needed to set up the encoder properly. */ #ifndef _OV_ENC_H_ #define _OV_ENC_H_ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #include "codec.h" /** * This is the primary function within libvorbisenc for setting up managed * bitrate modes. * * Before this function is called, the \ref vorbis_info * struct should be initialized by using vorbis_info_init() from the libvorbis * API. After encoding, vorbis_info_clear() should be called. * * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set * constraints for the encoded file. This function uses these settings to * select the appropriate encoding mode and set it up. * * \param vi Pointer to an initialized \ref vorbis_info struct. * \param channels The number of channels to be encoded. * \param rate The sampling rate of the source audio. * \param max_bitrate Desired maximum bitrate (limit). -1 indicates unset. * \param nominal_bitrate Desired average, or central, bitrate. -1 indicates unset. * \param min_bitrate Desired minimum bitrate. -1 indicates unset. * * \return Zero for success, and negative values for failure. * * \retval 0 Success. * \retval OV_EFAULT Internal logic fault; indicates a bug or heap/stack corruption. * \retval OV_EINVAL Invalid setup request, eg, out of range argument. * \retval OV_EIMPL Unimplemented mode; unable to comply with bitrate request. */ extern int vorbis_encode_init(vorbis_info *vi, long channels, long rate, long max_bitrate, long nominal_bitrate, long min_bitrate); /** * This function performs step-one of a three-step bitrate-managed encode * setup. It functions similarly to the one-step setup performed by \ref * vorbis_encode_init but allows an application to make further encode setup * tweaks using \ref vorbis_encode_ctl before finally calling \ref * vorbis_encode_setup_init to complete the setup process. * * Before this function is called, the \ref vorbis_info struct should be * initialized by using vorbis_info_init() from the libvorbis API. After * encoding, vorbis_info_clear() should be called. * * The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set * constraints for the encoded file. This function uses these settings to * select the appropriate encoding mode and set it up. * * \param vi Pointer to an initialized vorbis_info struct. * \param channels The number of channels to be encoded. * \param rate The sampling rate of the source audio. * \param max_bitrate Desired maximum bitrate (limit). -1 indicates unset. * \param nominal_bitrate Desired average, or central, bitrate. -1 indicates unset. * \param min_bitrate Desired minimum bitrate. -1 indicates unset. * * \return Zero for success, and negative for failure. * * \retval 0 Success * \retval OV_EFAULT Internal logic fault; indicates a bug or heap/stack corruption. * \retval OV_EINVAL Invalid setup request, eg, out of range argument. * \retval OV_EIMPL Unimplemented mode; unable to comply with bitrate request. */ extern int vorbis_encode_setup_managed(vorbis_info *vi, long channels, long rate, long max_bitrate, long nominal_bitrate, long min_bitrate); /** * This function performs step-one of a three-step variable bitrate * (quality-based) encode setup. It functions similarly to the one-step setup * performed by \ref vorbis_encode_init_vbr() but allows an application to * make further encode setup tweaks using \ref vorbis_encode_ctl() before * finally calling \ref vorbis_encode_setup_init to complete the setup * process. * * Before this function is called, the \ref vorbis_info struct should be * initialized by using \ref vorbis_info_init() from the libvorbis API. After * encoding, vorbis_info_clear() should be called. * * \param vi Pointer to an initialized vorbis_info struct. * \param channels The number of channels to be encoded. * \param rate The sampling rate of the source audio. * \param quality Desired quality level, currently from -0.1 to 1.0 (lo to hi). * * \return Zero for success, and negative values for failure. * * \retval 0 Success * \retval OV_EFAULT Internal logic fault; indicates a bug or heap/stack corruption. * \retval OV_EINVAL Invalid setup request, eg, out of range argument. * \retval OV_EIMPL Unimplemented mode; unable to comply with quality level request. */ extern int vorbis_encode_setup_vbr(vorbis_info *vi, long channels, long rate, float quality ); /** * This is the primary function within libvorbisenc for setting up variable * bitrate ("quality" based) modes. * * * Before this function is called, the vorbis_info struct should be * initialized by using vorbis_info_init() from the libvorbis API. After * encoding, vorbis_info_clear() should be called. * * \param vi Pointer to an initialized vorbis_info struct. * \param channels The number of channels to be encoded. * \param rate The sampling rate of the source audio. * \param base_quality Desired quality level, currently from -0.1 to 1.0 (lo to hi). * * * \return Zero for success, or a negative number for failure. * * \retval 0 Success * \retval OV_EFAULT Internal logic fault; indicates a bug or heap/stack corruption. * \retval OV_EINVAL Invalid setup request, eg, out of range argument. * \retval OV_EIMPL Unimplemented mode; unable to comply with quality level request. */ extern int vorbis_encode_init_vbr(vorbis_info *vi, long channels, long rate, float base_quality ); /** * This function performs the last stage of three-step encoding setup, as * described in the API overview under managed bitrate modes. * * Before this function is called, the \ref vorbis_info struct should be * initialized by using vorbis_info_init() from the libvorbis API, one of * \ref vorbis_encode_setup_managed() or \ref vorbis_encode_setup_vbr() called to * initialize the high-level encoding setup, and \ref vorbis_encode_ctl() * called if necessary to make encoding setup changes. * vorbis_encode_setup_init() finalizes the highlevel encoding structure into * a complete encoding setup after which the application may make no further * setup changes. * * After encoding, vorbis_info_clear() should be called. * * \param vi Pointer to an initialized \ref vorbis_info struct. * * \return Zero for success, and negative values for failure. * * \retval 0 Success. * \retval OV_EFAULT Internal logic fault; indicates a bug or heap/stack corruption. * * \retval OV_EINVAL Attempt to use vorbis_encode_setup_init() without first * calling one of vorbis_encode_setup_managed() or vorbis_encode_setup_vbr() to * initialize the high-level encoding setup * */ extern int vorbis_encode_setup_init(vorbis_info *vi); /** * This function implements a generic interface to miscellaneous encoder * settings similar to the classic UNIX 'ioctl()' system call. Applications * may use vorbis_encode_ctl() to query or set bitrate management or quality * mode details by using one of several \e request arguments detailed below. * vorbis_encode_ctl() must be called after one of * vorbis_encode_setup_managed() or vorbis_encode_setup_vbr(). When used * to modify settings, \ref vorbis_encode_ctl() must be called before \ref * vorbis_encode_setup_init(). * * \param vi Pointer to an initialized vorbis_info struct. * * \param number Specifies the desired action; See \ref encctlcodes "the list * of available requests". * * \param arg void * pointing to a data structure matching the request * argument. * * \retval 0 Success. Any further return information (such as the result of a * query) is placed into the storage pointed to by *arg. * * \retval OV_EINVAL Invalid argument, or an attempt to modify a setting after * calling vorbis_encode_setup_init(). * * \retval OV_EIMPL Unimplemented or unknown request */ extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg); /** * \deprecated This is a deprecated interface. Please use vorbis_encode_ctl() * with the \ref ovectl_ratemanage2_arg struct and \ref * OV_ECTL_RATEMANAGE2_GET and \ref OV_ECTL_RATEMANAGE2_SET calls in new code. * * The \ref ovectl_ratemanage_arg structure is used with vorbis_encode_ctl() * and the \ref OV_ECTL_RATEMANAGE_GET, \ref OV_ECTL_RATEMANAGE_SET, \ref * OV_ECTL_RATEMANAGE_AVG, \ref OV_ECTL_RATEMANAGE_HARD calls in order to * query and modify specifics of the encoder's bitrate management * configuration. */ struct ovectl_ratemanage_arg { int management_active; /**< nonzero if bitrate management is active*/ /** hard lower limit (in kilobits per second) below which the stream bitrate will never be allowed for any given bitrate_hard_window seconds of time.*/ long bitrate_hard_min; /** hard upper limit (in kilobits per second) above which the stream bitrate will never be allowed for any given bitrate_hard_window seconds of time.*/ long bitrate_hard_max; /** the window period (in seconds) used to regulate the hard bitrate minimum and maximum*/ double bitrate_hard_window; /** soft lower limit (in kilobits per second) below which the average bitrate tracker will start nudging the bitrate higher.*/ long bitrate_av_lo; /** soft upper limit (in kilobits per second) above which the average bitrate tracker will start nudging the bitrate lower.*/ long bitrate_av_hi; /** the window period (in seconds) used to regulate the average bitrate minimum and maximum.*/ double bitrate_av_window; /** Regulates the relative centering of the average and hard windows; in libvorbis 1.0 and 1.0.1, the hard window regulation overlapped but followed the average window regulation. In libvorbis 1.1 a bit-reservoir interface replaces the old windowing interface; the older windowing interface is simulated and this field has no effect.*/ double bitrate_av_window_center; }; /** * \name struct ovectl_ratemanage2_arg * * The ovectl_ratemanage2_arg structure is used with vorbis_encode_ctl() and * the OV_ECTL_RATEMANAGE2_GET and OV_ECTL_RATEMANAGE2_SET calls in order to * query and modify specifics of the encoder's bitrate management * configuration. * */ struct ovectl_ratemanage2_arg { int management_active; /**< nonzero if bitrate management is active */ /** Lower allowed bitrate limit in kilobits per second */ long bitrate_limit_min_kbps; /** Upper allowed bitrate limit in kilobits per second */ long bitrate_limit_max_kbps; long bitrate_limit_reservoir_bits; /**struct ovectl_ratemanage2_arg * * * Used to query the current encoder bitrate management setting. Also used to * initialize fields of an ovectl_ratemanage2_arg structure for use with * \ref OV_ECTL_RATEMANAGE2_SET. */ #define OV_ECTL_RATEMANAGE2_GET 0x14 /** * Set the current encoder bitrate management settings. * * Argument: struct ovectl_ratemanage2_arg * * * Used to set the current encoder bitrate management settings to the values * listed in the ovectl_ratemanage2_arg. Passing a NULL pointer will disable * bitrate management. */ #define OV_ECTL_RATEMANAGE2_SET 0x15 /** * Returns the current encoder hard-lowpass setting (kHz) in the double * pointed to by arg. * * Argument: double * */ #define OV_ECTL_LOWPASS_GET 0x20 /** * Sets the encoder hard-lowpass to the value (kHz) pointed to by arg. Valid * lowpass settings range from 2 to 99. * * Argument: double * */ #define OV_ECTL_LOWPASS_SET 0x21 /** * Returns the current encoder impulse block setting in the double pointed * to by arg. * * Argument: double * */ #define OV_ECTL_IBLOCK_GET 0x30 /** * Sets the impulse block bias to the the value pointed to by arg. * * Argument: double * * * Valid range is -15.0 to 0.0 [default]. A negative impulse block bias will * direct to encoder to use more bits when incoding short blocks that contain * strong impulses, thus improving the accuracy of impulse encoding. */ #define OV_ECTL_IBLOCK_SET 0x31 /** * Returns the current encoder coupling setting in the int pointed * to by arg. * * Argument: int * */ #define OV_ECTL_COUPLING_GET 0x40 /** * Enables/disables channel coupling in multichannel encoding according to arg. * * Argument: int * * * Zero disables channel coupling for multichannel inputs, nonzer enables * channel coupling. Setting has no effect on monophonic encoding or * multichannel counts that do not offer coupling. At present, coupling is * available for stereo and 5.1 encoding. */ #define OV_ECTL_COUPLING_SET 0x41 /* deprecated rate management supported only for compatibility */ /** * Old interface to querying bitrate management settings. * * Deprecated after move to bit-reservoir style management in 1.1 rendered * this interface partially obsolete. * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_GET instead. * * Argument: struct ovectl_ratemanage_arg * */ #define OV_ECTL_RATEMANAGE_GET 0x10 /** * Old interface to modifying bitrate management settings. * * deprecated after move to bit-reservoir style management in 1.1 rendered * this interface partially obsolete. * * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead. * * Argument: struct ovectl_ratemanage_arg * */ #define OV_ECTL_RATEMANAGE_SET 0x11 /** * Old interface to setting average-bitrate encoding mode. * * Deprecated after move to bit-reservoir style management in 1.1 rendered * this interface partially obsolete. * * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead. * * Argument: struct ovectl_ratemanage_arg * */ #define OV_ECTL_RATEMANAGE_AVG 0x12 /** * Old interface to setting bounded-bitrate encoding modes. * * deprecated after move to bit-reservoir style management in 1.1 rendered * this interface partially obsolete. * * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead. * * Argument: struct ovectl_ratemanage_arg * */ #define OV_ECTL_RATEMANAGE_HARD 0x13 /*@}*/ #ifdef __cplusplus } #endif /* __cplusplus */ #endif Index: ps/trunk/libraries/win32/vorbis/include/vorbis/vorbisfile.h =================================================================== --- ps/trunk/libraries/win32/vorbis/include/vorbis/vorbisfile.h (revision 22405) +++ ps/trunk/libraries/win32/vorbis/include/vorbis/vorbisfile.h (revision 22406) @@ -1,206 +1,205 @@ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.h 17182 2010-04-29 03:48:32Z xiphmont $ ********************************************************************/ #ifndef _OV_FILE_H_ #define _OV_FILE_H_ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #include #include "codec.h" /* The function prototypes for the callbacks are basically the same as for * the stdio functions fread, fseek, fclose, ftell. * The one difference is that the FILE * arguments have been replaced with * a void * - this is to be used as a pointer to whatever internal data these * functions might need. In the stdio case, it's just a FILE * cast to a void * * * If you use other functions, check the docs for these functions and return * the right values. For seek_func(), you *MUST* return -1 if the stream is * unseekable */ typedef struct { size_t (*read_func) (void *ptr, size_t size, size_t nmemb, void *datasource); int (*seek_func) (void *datasource, ogg_int64_t offset, int whence); int (*close_func) (void *datasource); long (*tell_func) (void *datasource); } ov_callbacks; #ifndef OV_EXCLUDE_STATIC_CALLBACKS /* a few sets of convenient callbacks, especially for use under * Windows where ov_open_callbacks() should always be used instead of * ov_open() to avoid problems with incompatible crt.o version linking * issues. */ static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){ if(f==NULL)return(-1); #ifdef __MINGW32__ return fseeko64(f,off,whence); #elif defined (_WIN32) return _fseeki64(f,off,whence); #else return fseek(f,off,whence); #endif } /* These structs below (OV_CALLBACKS_DEFAULT etc) are defined here as * static data. That means that every file which includes this header * will get its own copy of these structs whether it uses them or * not unless it #defines OV_EXCLUDE_STATIC_CALLBACKS. * These static symbols are essential on platforms such as Windows on * which several different versions of stdio support may be linked to * by different DLLs, and we need to be certain we know which one * we're using (the same one as the main application). */ static ov_callbacks OV_CALLBACKS_DEFAULT = { (size_t (*)(void *, size_t, size_t, void *)) fread, (int (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, (int (*)(void *)) fclose, (long (*)(void *)) ftell }; static ov_callbacks OV_CALLBACKS_NOCLOSE = { (size_t (*)(void *, size_t, size_t, void *)) fread, (int (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, (int (*)(void *)) NULL, (long (*)(void *)) ftell }; static ov_callbacks OV_CALLBACKS_STREAMONLY = { (size_t (*)(void *, size_t, size_t, void *)) fread, (int (*)(void *, ogg_int64_t, int)) NULL, (int (*)(void *)) fclose, (long (*)(void *)) NULL }; static ov_callbacks OV_CALLBACKS_STREAMONLY_NOCLOSE = { (size_t (*)(void *, size_t, size_t, void *)) fread, (int (*)(void *, ogg_int64_t, int)) NULL, (int (*)(void *)) NULL, (long (*)(void *)) NULL }; #endif #define NOTOPEN 0 #define PARTOPEN 1 #define OPENED 2 #define STREAMSET 3 #define INITSET 4 typedef struct OggVorbis_File { void *datasource; /* Pointer to a FILE *, etc. */ int seekable; ogg_int64_t offset; ogg_int64_t end; ogg_sync_state oy; /* If the FILE handle isn't seekable (eg, a pipe), only the current stream appears */ int links; ogg_int64_t *offsets; ogg_int64_t *dataoffsets; long *serialnos; ogg_int64_t *pcmlengths; /* overloaded to maintain binary compatibility; x2 size, stores both beginning and end values */ vorbis_info *vi; vorbis_comment *vc; /* Decoding working state local storage */ ogg_int64_t pcm_offset; int ready_state; long current_serialno; int current_link; double bittrack; double samptrack; ogg_stream_state os; /* take physical pages, weld into a logical stream of packets */ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ vorbis_block vb; /* local working space for packet->PCM decode */ ov_callbacks callbacks; } OggVorbis_File; extern int ov_clear(OggVorbis_File *vf); extern int ov_fopen(const char *path,OggVorbis_File *vf); extern int ov_open(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes); extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks); extern int ov_test(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes); extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks); extern int ov_test_open(OggVorbis_File *vf); extern long ov_bitrate(OggVorbis_File *vf,int i); extern long ov_bitrate_instant(OggVorbis_File *vf); extern long ov_streams(OggVorbis_File *vf); extern long ov_seekable(OggVorbis_File *vf); extern long ov_serialnumber(OggVorbis_File *vf,int i); extern ogg_int64_t ov_raw_total(OggVorbis_File *vf,int i); extern ogg_int64_t ov_pcm_total(OggVorbis_File *vf,int i); extern double ov_time_total(OggVorbis_File *vf,int i); extern int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_time_seek(OggVorbis_File *vf,double pos); extern int ov_time_seek_page(OggVorbis_File *vf,double pos); extern int ov_raw_seek_lap(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_pcm_seek_lap(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_pcm_seek_page_lap(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_time_seek_lap(OggVorbis_File *vf,double pos); extern int ov_time_seek_page_lap(OggVorbis_File *vf,double pos); extern ogg_int64_t ov_raw_tell(OggVorbis_File *vf); extern ogg_int64_t ov_pcm_tell(OggVorbis_File *vf); extern double ov_time_tell(OggVorbis_File *vf); extern vorbis_info *ov_info(OggVorbis_File *vf,int link); extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link); extern long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int samples, int *bitstream); extern long ov_read_filter(OggVorbis_File *vf,char *buffer,int length, int bigendianp,int word,int sgned,int *bitstream, void (*filter)(float **pcm,long channels,long samples,void *filter_param),void *filter_param); extern long ov_read(OggVorbis_File *vf,char *buffer,int length, int bigendianp,int word,int sgned,int *bitstream); extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2); extern int ov_halfrate(OggVorbis_File *vf,int flag); extern int ov_halfrate_p(OggVorbis_File *vf); #ifdef __cplusplus } #endif /* __cplusplus */ #endif Index: ps/trunk/libraries/win32/vorbis/lib/libogg.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/libogg.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/libogg.lib (nonexistent) +++ ps/trunk/libraries/win32/vorbis/lib/libogg.lib (revision 22406) Property changes on: ps/trunk/libraries/win32/vorbis/lib/libogg.lib ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/liboggd.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/liboggd.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/liboggd.lib (nonexistent) +++ ps/trunk/libraries/win32/vorbis/lib/liboggd.lib (revision 22406) Property changes on: ps/trunk/libraries/win32/vorbis/lib/liboggd.lib ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/libvorbis.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/libvorbis.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/libvorbis.lib (nonexistent) +++ ps/trunk/libraries/win32/vorbis/lib/libvorbis.lib (revision 22406) Property changes on: ps/trunk/libraries/win32/vorbis/lib/libvorbis.lib ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/libvorbisd.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/libvorbisd.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/libvorbisd.lib (nonexistent) +++ ps/trunk/libraries/win32/vorbis/lib/libvorbisd.lib (revision 22406) Property changes on: ps/trunk/libraries/win32/vorbis/lib/libvorbisd.lib ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/libvorbisfile.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/libvorbisfile.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/libvorbisfile.lib (nonexistent) +++ ps/trunk/libraries/win32/vorbis/lib/libvorbisfile.lib (revision 22406) Property changes on: ps/trunk/libraries/win32/vorbis/lib/libvorbisfile.lib ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/libraries/win32/vorbis/lib/libvorbisfiled.lib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/libraries/win32/vorbis/lib/libvorbisfiled.lib =================================================================== --- ps/trunk/libraries/win32/vorbis/lib/libvorbisfiled.lib (nonexistent) +++ ps/trunk/libraries/win32/vorbis/lib/libvorbisfiled.lib (revision 22406) Property changes on: ps/trunk/libraries/win32/vorbis/lib/libvorbisfiled.lib ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/source/lib/external_libraries/vorbis.h =================================================================== --- ps/trunk/source/lib/external_libraries/vorbis.h (revision 22405) +++ ps/trunk/source/lib/external_libraries/vorbis.h (revision 22406) @@ -1,40 +1,40 @@ -/* Copyright (C) 2010 Wildfire Games. +/* Copyright (C) 2019 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* * bring in OGG Vorbis header+library */ #ifndef INCLUDED_VORBIS #define INCLUDED_VORBIS #include #if MSC_VERSION # ifdef NDEBUG -# pragma comment(lib, "vorbisfile.lib") +# pragma comment(lib, "libvorbisfile.lib") # else -# pragma comment(lib, "vorbisfile_d.lib") +# pragma comment(lib, "libvorbisfiled.lib") # endif #endif #endif // #ifndef INCLUDED_VORBIS