Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5033] trunk/OpenMPT
|
From: <man...@us...> - 2015-05-03 08:30:30
|
Revision: 5033
http://sourceforge.net/p/modplug/code/5033
Author: manxorist
Date: 2015-05-03 08:30:16 +0000 (Sun, 03 May 2015)
Log Message:
-----------
[Var] ogg: Add the full libogg 1.3.2 instead of just the public header files. It contains only 2 .c files anyway.
[Ref] Stream export: Remove dynamic loading code for external libogg in Vorbis and Opus exporters.
[Mod] build: Build libFLAC with libogg support.
[New] FLAC: Support loading OggFlac files and add the .oga extension to the appropriate file open dialogs.
[Mod] OpenMPT: Version is now 1.25.00.03
Modified Paths:
--------------
trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua
trunk/OpenMPT/build/premake4.lua
trunk/OpenMPT/build/vs2008/openmpt123.sln
trunk/OpenMPT/build/vs2008/openmpt123.vcproj
trunk/OpenMPT/build/vs2008-ext/flac.vcproj
trunk/OpenMPT/build/vs2010/openmpt123.sln
trunk/OpenMPT/build/vs2010/openmpt123.vcxproj
trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/flac.vcxproj
trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters
trunk/OpenMPT/common/BuildSettings.h
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/MPTRACK_10.sln
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/openmpt123/openmpt123.sln
trunk/OpenMPT/openmpt123/openmpt123.vcxproj
trunk/OpenMPT/soundlib/SampleFormats.cpp
Added Paths:
-----------
trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua
trunk/OpenMPT/build/vs2008-ext/ogg.vcproj
trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj
trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj.filters
trunk/OpenMPT/include/ogg/AUTHORS
trunk/OpenMPT/include/ogg/CHANGES
trunk/OpenMPT/include/ogg/COPYING
trunk/OpenMPT/include/ogg/OpenMPT.txt
trunk/OpenMPT/include/ogg/README
trunk/OpenMPT/include/ogg/include/
trunk/OpenMPT/include/ogg/include/ogg/
trunk/OpenMPT/include/ogg/include/ogg/ogg.h
trunk/OpenMPT/include/ogg/include/ogg/os_types.h
trunk/OpenMPT/include/ogg/src/
trunk/OpenMPT/include/ogg/src/bitwise.c
trunk/OpenMPT/include/ogg/src/framing.c
trunk/OpenMPT/include/ogg/win32/
trunk/OpenMPT/include/ogg/win32/ogg.def
Removed Paths:
-------------
trunk/OpenMPT/include/ogg/ogg.h
trunk/OpenMPT/include/ogg/os_types.h
Property Changed:
----------------
trunk/OpenMPT/include/ogg/
Modified: trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -4,7 +4,7 @@
language "C"
location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/flac"
- includedirs { "../../include/flac/include", "../../include/flac/src/libFLAC/include" }
+ includedirs { "../../include/flac/include", "../../include/flac/src/libFLAC/include", "../../include/ogg/include" }
files {
"../../include/flac/src/libFLAC/bitmath.c",
"../../include/flac/src/libFLAC/bitreader.c",
@@ -25,6 +25,10 @@
"../../include/flac/src/libFLAC/memory.c",
"../../include/flac/src/libFLAC/metadata_iterators.c",
"../../include/flac/src/libFLAC/metadata_object.c",
+ "../../include/flac/src/libFLAC/ogg_decoder_aspect.c",
+ "../../include/flac/src/libFLAC/ogg_encoder_aspect.c",
+ "../../include/flac/src/libFLAC/ogg_helper.c",
+ "../../include/flac/src/libFLAC/ogg_mapping.c",
"../../include/flac/src/libFLAC/stream_decoder.c",
"../../include/flac/src/libFLAC/stream_encoder.c",
"../../include/flac/src/libFLAC/stream_encoder_intrin_avx2.c",
@@ -50,6 +54,10 @@
"../../include/flac/src/libFLAC/include/private/md5.h",
"../../include/flac/src/libFLAC/include/private/memory.h",
"../../include/flac/src/libFLAC/include/private/metadata.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_decoder_aspect.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_encoder_aspect.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_helper.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_mapping.h",
"../../include/flac/src/libFLAC/include/private/stream_encoder.h",
"../../include/flac/src/libFLAC/include/private/stream_encoder_framing.h",
"../../include/flac/src/libFLAC/include/private/window.h",
@@ -69,7 +77,7 @@
"../../include/flac/include/FLAC/stream_encoder.h",
}
buildoptions { "/wd4244", "/wd4267", "/wd4334" }
- defines { "FLAC__NO_DLL" }
+ defines { "FLAC__NO_DLL", "FLAC__HAS_OGG=1" }
configuration "vs2010"
defines { "VERSION=\"1.3.1\"" }
configuration "vs2008"
Added: trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -0,0 +1,15 @@
+
+ project "ogg"
+ uuid "d8d5e11c-f959-49ef-b741-b3f6de52ded8"
+ language "C"
+ location ( "../../build/" .. _ACTION .. "-ext" )
+ objdir "../../build/obj/ogg"
+ includedirs { "../../include/ogg/include" }
+ files {
+ "../../include/ogg/include/ogg/ogg.h",
+ "../../include/ogg/include/ogg/os_types.h",
+ "../../include/ogg/src/bitwise.c",
+ "../../include/ogg/src/framing.c",
+ }
+ dofile "../../build/premake4-win/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-win/premake4-defaults-static.lua"
Property changes on: trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-lua
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -22,6 +22,7 @@
"libopenmpt",
"miniz",
"flac",
+ "ogg",
"portaudio",
"ksuser",
"winmm",
Modified: trunk/OpenMPT/build/premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4.lua 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -176,6 +176,7 @@
dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua"
dofile "../build/premake4-win/ext-flac.premake4.lua"
dofile "../build/premake4-win/ext-miniz.premake4.lua"
+ dofile "../build/premake4-win/ext-ogg.premake4.lua"
dofile "../build/premake4-win/ext-portaudio.premake4.lua"
end
@@ -192,6 +193,7 @@
dofile "../build/premake4-win/ext-miniz.premake4.lua"
dofile "../build/premake4-win/ext-miniz-shared.premake4.lua"
dofile "../build/premake4-win/ext-minizip.premake4.lua"
+ dofile "../build/premake4-win/ext-ogg.premake4.lua"
dofile "../build/premake4-win/ext-portaudio.premake4.lua"
dofile "../build/premake4-win/ext-portmidi.premake4.lua"
dofile "../build/premake4-win/ext-pugixml.premake4.lua"
Modified: trunk/OpenMPT/build/vs2008/openmpt123.sln
===================================================================
--- trunk/OpenMPT/build/vs2008/openmpt123.sln 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2008/openmpt123.sln 2015-05-03 08:30:16 UTC (rev 5033)
@@ -6,6 +6,7 @@
{9C5101EF-3E20-4558-809B-277FDD50E878} = {9C5101EF-3E20-4558-809B-277FDD50E878}
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5} = {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8} = {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}
{189B867F-FF4B-45A1-B741-A97492EE69AF} = {189B867F-FF4B-45A1-B741-A97492EE69AF}
EndProjectSection
EndProject
@@ -18,6 +19,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "..\vs2008-ext\miniz.vcproj", "{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "..\vs2008-ext\ogg.vcproj", "{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\vs2008-ext\portaudio.vcproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
EndProject
Global
@@ -60,6 +63,14 @@
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.Build.0 = Release|Win32
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.ActiveCfg = Release|x64
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.Build.0 = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64
Modified: trunk/OpenMPT/build/vs2008/openmpt123.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/openmpt123.vcproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2008/openmpt123.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x32\Debug\libopenmpt.lib ..\lib\x32\Debug\miniz.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x32\Debug\libopenmpt.lib ..\lib\x32\Debug\miniz.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\ogg.lib ..\lib\x32\Debug\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -153,7 +153,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x64\Debug\libopenmpt.lib ..\lib\x64\Debug\miniz.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x64\Debug\libopenmpt.lib ..\lib\x64\Debug\miniz.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\ogg.lib ..\lib\x64\Debug\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -238,7 +238,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x32\Release\libopenmpt.lib ..\lib\x32\Release\miniz.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x32\Release\libopenmpt.lib ..\lib\x32\Release\miniz.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\ogg.lib ..\lib\x32\Release\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -326,7 +326,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x64\Release\libopenmpt.lib ..\lib\x64\Release\miniz.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x64\Release\libopenmpt.lib ..\lib\x64\Release\miniz.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\ogg.lib ..\lib\x64\Release\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
Modified: trunk/OpenMPT/build/vs2008-ext/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008-ext/flac.vcproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2008-ext/flac.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -44,8 +44,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,8 +61,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -123,8 +123,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -140,8 +140,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -201,8 +201,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -218,8 +218,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -280,8 +280,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -297,8 +297,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -358,8 +358,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -375,8 +375,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -437,8 +437,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -454,8 +454,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -570,6 +570,22 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_decoder_aspect.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_encoder_aspect.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_helper.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_mapping.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h"
>
</File>
@@ -677,6 +693,22 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_decoder_aspect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_encoder_aspect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_helper.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_mapping.c"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\stream_decoder.c"
>
</File>
Added: trunk/OpenMPT/build/vs2008-ext/ogg.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008-ext/ogg.vcproj (rev 0)
+++ trunk/OpenMPT/build/vs2008-ext/ogg.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ogg"
+ ProjectGUID="{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+ RootNamespace="ogg"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib\x32\Debug"
+ IntermediateDirectory="..\obj\ogg\x32\Debug"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\lib\x64\Debug"
+ IntermediateDirectory="..\obj\ogg\x64\Debug"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\lib\x32\Release"
+ IntermediateDirectory="..\obj\ogg\x32\Release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\lib\x64\Release"
+ IntermediateDirectory="..\obj\ogg\x64\Release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="ReleaseNoLTCG|Win32"
+ OutputDirectory="..\lib\x32\ReleaseNoLTCG"
+ IntermediateDirectory="..\obj\ogg\x32\ReleaseNoLTCG"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/GL- /MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="0"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="ReleaseNoLTCG|x64"
+ OutputDirectory="..\lib\x64\ReleaseNoLTCG"
+ IntermediateDirectory="..\obj\ogg\x64\ReleaseNoLTCG"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/GL- /MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="0"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="include"
+ Filter=""
+ >
+ <Filter
+ Name="ogg"
+ Filter=""
+ >
+ <Filter
+ Name="include"
+ Filter=""
+ >
+ <Filter
+ Name="ogg"
+ Filter=""
+ >
+ <File
+ RelativePath="..\..\include\ogg\include\ogg\ogg.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\ogg\include\ogg\os_types.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="src"
+ Filter=""
+ >
+ <File
+ RelativePath="..\..\include\ogg\src\bitwise.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\ogg\src\framing.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/OpenMPT/build/vs2008-ext/ogg.vcproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-vcproj
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Modified: trunk/OpenMPT/build/vs2010/openmpt123.sln
===================================================================
--- trunk/OpenMPT/build/vs2010/openmpt123.sln 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010/openmpt123.sln 2015-05-03 08:30:16 UTC (rev 5033)
@@ -6,6 +6,7 @@
{9C5101EF-3E20-4558-809B-277FDD50E878} = {9C5101EF-3E20-4558-809B-277FDD50E878}
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5} = {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8} = {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}
{189B867F-FF4B-45A1-B741-A97492EE69AF} = {189B867F-FF4B-45A1-B741-A97492EE69AF}
EndProjectSection
EndProject
@@ -18,6 +19,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "..\vs2010-ext\miniz.vcxproj", "{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "..\vs2010-ext\ogg.vcxproj", "{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\vs2010-ext\portaudio.vcxproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
EndProject
Global
@@ -60,6 +63,14 @@
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.Build.0 = Release|Win32
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.ActiveCfg = Release|x64
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.Build.0 = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64
Modified: trunk/OpenMPT/build/vs2010/openmpt123.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/openmpt123.vcxproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010/openmpt123.vcxproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -99,7 +99,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x32\Debug\libopenmpt.lib;..\lib\x32\Debug\miniz.lib;..\lib\x32\Debug\flac.lib;..\lib\x32\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x32\Debug\libopenmpt.lib;..\lib\x32\Debug\miniz.lib;..\lib\x32\Debug\flac.lib;..\lib\x32\Debug\ogg.lib;..\lib\x32\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
@@ -130,7 +130,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x64\Debug\libopenmpt.lib;..\lib\x64\Debug\miniz.lib;..\lib\x64\Debug\flac.lib;..\lib\x64\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x64\Debug\libopenmpt.lib;..\lib\x64\Debug\miniz.lib;..\lib\x64\Debug\flac.lib;..\lib\x64\Debug\ogg.lib;..\lib\x64\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
@@ -163,7 +163,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x32\Release\libopenmpt.lib;..\lib\x32\Release\miniz.lib;..\lib\x32\Release\flac.lib;..\lib\x32\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x32\Release\libopenmpt.lib;..\lib\x32\Release\miniz.lib;..\lib\x32\Release\flac.lib;..\lib\x32\Release\ogg.lib;..\lib\x32\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
@@ -198,7 +198,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x64\Release\libopenmpt.lib;..\lib\x64\Release\miniz.lib;..\lib\x64\Release\flac.lib;..\lib\x64\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x64\Release\libopenmpt.lib;..\lib\x64\Release\miniz.lib;..\lib\x64\Release\flac.lib;..\lib\x64\Release\ogg.lib;..\lib\x64\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
Modified: trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters 2015-05-03 08:30:16 UTC (rev 5033)
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="openmpt123">
- <UniqueIdentifier>{36BC9D47-3BB6-D647-8302-CDBA8C0F4B23}</UniqueIdentifier>
+ <UniqueIdentifier>{CF1D4909-84D9-DB4E-A32B-526855292C75}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/vs2010-ext/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010-ext/flac.vcxproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010-ext/flac.vcxproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -113,8 +113,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -125,8 +125,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -141,8 +141,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -153,8 +153,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -169,8 +169,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -182,8 +182,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -200,8 +200,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -213,8 +213,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -231,8 +231,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -244,8 +244,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -261,8 +261,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -274,8 +274,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -301,6 +301,10 @@
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\md5.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\memory.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\metadata.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_decoder_aspect.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_encoder_aspect.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_helper.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_mapping.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder_framing.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\window.h" />
@@ -356,6 +360,14 @@
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\metadata_object.c">
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_decoder_aspect.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_encoder_aspect.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_helper.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_mapping.c">
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_decoder.c">
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder.c">
Modified: trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters 2015-05-03 08:30:16 UTC (rev 5033)
@@ -2,37 +2,37 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{477C8603-F00B-2548-A767-80645328275F}</UniqueIdentifier>
+ <UniqueIdentifier>{6669F788-380B-1B4D-A4F3-04EEB5A94E32}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac">
- <UniqueIdentifier>{FB8083B0-F94E-BC42-9611-97668E17BB3F}</UniqueIdentifier>
+ <UniqueIdentifier>{549D34D9-CACC-3E45-A67D-36050400B29E}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src">
- <UniqueIdentifier>{A78D6E10-3207-DE4C-ABF4-20FEA738D089}</UniqueIdentifier>
+ <UniqueIdentifier>{5C09BD43-A463-CC4D-8272-D1116445D621}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC">
- <UniqueIdentifier>{F344F723-2860-1B47-96CF-BED27AB2FAA8}</UniqueIdentifier>
+ <UniqueIdentifier>{20FE52D8-0F04-F149-80CC-A6C0DF9A5D6D}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include">
- <UniqueIdentifier>{8F36D088-C9F7-E341-90AA-19E71FC3C951}</UniqueIdentifier>
+ <UniqueIdentifier>{298BE21E-5DD0-B248-AB54-42D22A72A60F}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\private">
- <UniqueIdentifier>{3BB747A3-CD90-2B46-907B-473C1459D681}</UniqueIdentifier>
+ <UniqueIdentifier>{1E557C2C-9A6A-2B4B-8472-07EFA30FC503}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\protected">
- <UniqueIdentifier>{02E621ED-7A70-104A-9D42-AB256A5BFAC2}</UniqueIdentifier>
+ <UniqueIdentifier>{5807E4EA-A6AD-3F4D-B661-7D4346350C72}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include">
- <UniqueIdentifier>{44D88C36-692F-1B49-BD6A-0DB1570A6EDD}</UniqueIdentifier>
+ <UniqueIdentifier>{772B6428-08A9-4942-BE5A-0F3F5D8C4A79}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include\FLAC">
- <UniqueIdentifier>{8026CF0C-4EEF-FF4B-A3F7-2BE4A5E84820}</UniqueIdentifier>
+ <UniqueIdentifier>{39DC99E4-1018-B54D-A39B-2A4C1E941BDA}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\share">
- <UniqueIdentifier>{4F49EEEE-0FD6-A34D-A515-E76D63A4EA2B}</UniqueIdentifier>
+ <UniqueIdentifier>{0ED27C4A-47A1-E146-A272-8E74C242242F}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\share\win_utf8_io">
- <UniqueIdentifier>{CFB3088D-B183...
[truncated message content] |
