ffmpeg fixes/changes from cvpcs
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHa"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";../extern/ffmpeg/include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -51,7 +51,7 @@
|
||||
OutputFile="../Program/StepMania-debug.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/StepMania.pdb"
|
||||
@@ -110,7 +110,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
|
||||
FavorSizeOrSpeed="2"
|
||||
OptimizeForProcessor="2"
|
||||
OptimizeForWindowsApplication="TRUE"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";../extern/ffmpeg/include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
||||
StringPooling="TRUE"
|
||||
MinimalRebuild="FALSE"
|
||||
@@ -135,12 +135,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj""
|
||||
AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib ffmpeg/modern_working/lib/avcodec.lib ffmpeg/modern_working/lib/avformat.lib ffmpeg/modern_working/lib/avutil.lib ffmpeg/modern_working/lib/swscale.lib"
|
||||
AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib ../extern/ffmpeg/lib/avcodec.lib ../extern/ffmpeg/lib/avformat.lib ../extern/ffmpeg/lib/avutil.lib ../extern/ffmpeg/lib/swscale.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile="../Program/StepMania.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib"
|
||||
ProgramDatabaseFile="$(IntDir)/StepMania.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@@ -192,7 +192,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHa"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";../extern/ffmpeg/include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="0"
|
||||
@@ -218,7 +218,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
|
||||
OutputFile="..\Program\StepMania-fastdebug.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/StepMania.pdb"
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";../extern/ffmpeg/include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -84,7 +84,7 @@
|
||||
OutputFile="../Program/StepMania-debug.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
GenerateManifest="true"
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib;msvcrt.lib"
|
||||
GenerateDebugInformation="true"
|
||||
@@ -157,7 +157,7 @@
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="2"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";../extern/ffmpeg/include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
|
||||
StringPooling="true"
|
||||
MinimalRebuild="false"
|
||||
@@ -195,7 +195,7 @@
|
||||
OutputFile="../Program/StepMania.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib"
|
||||
ProgramDatabaseFile="$(IntDir)/StepMania.pdb"
|
||||
GenerateMapFile="true"
|
||||
@@ -263,7 +263,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";../extern/ffmpeg/include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="0"
|
||||
@@ -298,7 +298,7 @@
|
||||
OutputFile="../Program/StepMania-fastdebug.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
GenerateManifest="true"
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib;msvcrt.lib"
|
||||
GenerateDebugInformation="true"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -81,11 +81,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj""
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ffmpeg/modern_working/lib/avcodec.lib ffmpeg/modern_working/lib/avformat.lib ffmpeg/modern_working/lib/avutil.lib ffmpeg/modern_working/lib/swscale.lib"
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ../extern/ffmpeg/lib/avcodec.lib ../extern/ffmpeg/lib/avformat.lib ../extern/ffmpeg/lib/avutil.lib ../extern/ffmpeg/lib/swscale.lib"
|
||||
OutputFile="../Program/StepMania-debug.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib\;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
GenerateManifest="true"
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib;msvcrt.lib"
|
||||
GenerateDebugInformation="true"
|
||||
@@ -158,7 +158,7 @@
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="2"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
||||
StringPooling="true"
|
||||
MinimalRebuild="false"
|
||||
@@ -192,11 +192,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj""
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ffmpeg/modern_working/lib/avcodec.lib ffmpeg/modern_working/lib/avformat.lib ffmpeg/modern_working/lib/avutil.lib ffmpeg/modern_working/lib/swscale.lib"
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ../extern/ffmpeg/lib/avcodec.lib ../extern/ffmpeg/lib/avformat.lib ../extern/ffmpeg/lib/avutil.lib ../extern/ffmpeg/lib/swscale.lib"
|
||||
OutputFile="../Program/StepMania.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib\;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib"
|
||||
ProgramDatabaseFile="$(IntDir)/StepMania.pdb"
|
||||
GenerateMapFile="true"
|
||||
@@ -263,7 +263,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="0"
|
||||
@@ -294,11 +294,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj""
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ffmpeg/modern_working/lib/avcodec.lib ffmpeg/modern_working/lib/avformat.lib ffmpeg/modern_working/lib/avutil.lib ffmpeg/modern_working/lib/swscale.lib"
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ../extern/ffmpeg/lib/avcodec.lib ../extern/ffmpeg/lib/avformat.lib ../extern/ffmpeg/lib/avutil.lib ../extern/ffmpeg/lib/swscale.lib"
|
||||
OutputFile="../Program/StepMania-fastdebug.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib\;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
GenerateManifest="true"
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib;msvcrt.lib"
|
||||
GenerateDebugInformation="true"
|
||||
@@ -371,7 +371,7 @@
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
||||
StringPooling="true"
|
||||
MinimalRebuild="false"
|
||||
@@ -406,11 +406,11 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386 "$(intdir)\verstub.obj""
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ffmpeg/modern_working/lib/avcodec.lib ffmpeg/modern_working/lib/avformat.lib ffmpeg/modern_working/lib/avutil.lib ffmpeg/modern_working/lib/swscale.lib"
|
||||
AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib Comctl32.lib ../extern/ffmpeg/lib/avcodec.lib ../extern/ffmpeg/lib/avformat.lib ../extern/ffmpeg/lib/avutil.lib ../extern/ffmpeg/lib/swscale.lib"
|
||||
OutputFile="..\Program/StepMania-SSE2.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
AdditionalLibraryDirectories="..\extern\ffmpeg\lib\;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib"
|
||||
ProgramDatabaseFile="$(IntDir)/StepMania-SSE2.pdb"
|
||||
GenerateMapFile="true"
|
||||
|
||||
@@ -9,15 +9,11 @@
|
||||
|
||||
namespace avcodec
|
||||
{
|
||||
#if defined(MACOSX)
|
||||
#include <ffmpeg/avcodec.h>
|
||||
#else
|
||||
extern "C"
|
||||
{
|
||||
#include <libavcodec/avcodec.h> // for avcodec::img_convert
|
||||
#include <libswscale/swscale.h>
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
// #define HAVE_THEORAEXP
|
||||
|
||||
Reference in New Issue
Block a user