diff Build/Visual Studio 2012/World of Might and Magic.vcxproj @ 2139:f9b55be70c1b

Слияние
author Ritor1
date Thu, 02 Jan 2014 09:11:28 +0600
parents 992d2e6f907d
children d44b7775fc06
line wrap: on
line diff
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Thu Jan 02 09:11:01 2014 +0600
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Thu Jan 02 09:11:28 2014 +0600
@@ -286,6 +286,72 @@
     <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h" />
     <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h" />
     <ClInclude Include="..\..\lib\legacy_dx\strsafe.h" />
+    <ClInclude Include="..\..\lib\libavcodec\avcodec.h" />
+    <ClInclude Include="..\..\lib\libavcodec\avfft.h" />
+    <ClInclude Include="..\..\lib\libavcodec\dxva2.h" />
+    <ClInclude Include="..\..\lib\libavcodec\old_codec_ids.h" />
+    <ClInclude Include="..\..\lib\libavcodec\vaapi.h" />
+    <ClInclude Include="..\..\lib\libavcodec\vda.h" />
+    <ClInclude Include="..\..\lib\libavcodec\vdpau.h" />
+    <ClInclude Include="..\..\lib\libavcodec\version.h" />
+    <ClInclude Include="..\..\lib\libavcodec\xvmc.h" />
+    <ClInclude Include="..\..\lib\libavformat\avformat.h" />
+    <ClInclude Include="..\..\lib\libavformat\avio.h" />
+    <ClInclude Include="..\..\lib\libavformat\version.h" />
+    <ClInclude Include="..\..\lib\libavutil\adler32.h" />
+    <ClInclude Include="..\..\lib\libavutil\aes.h" />
+    <ClInclude Include="..\..\lib\libavutil\attributes.h" />
+    <ClInclude Include="..\..\lib\libavutil\audioconvert.h" />
+    <ClInclude Include="..\..\lib\libavutil\audio_fifo.h" />
+    <ClInclude Include="..\..\lib\libavutil\avassert.h" />
+    <ClInclude Include="..\..\lib\libavutil\avconfig.h" />
+    <ClInclude Include="..\..\lib\libavutil\avstring.h" />
+    <ClInclude Include="..\..\lib\libavutil\avutil.h" />
+    <ClInclude Include="..\..\lib\libavutil\base64.h" />
+    <ClInclude Include="..\..\lib\libavutil\blowfish.h" />
+    <ClInclude Include="..\..\lib\libavutil\bprint.h" />
+    <ClInclude Include="..\..\lib\libavutil\bswap.h" />
+    <ClInclude Include="..\..\lib\libavutil\buffer.h" />
+    <ClInclude Include="..\..\lib\libavutil\channel_layout.h" />
+    <ClInclude Include="..\..\lib\libavutil\common.h" />
+    <ClInclude Include="..\..\lib\libavutil\cpu.h" />
+    <ClInclude Include="..\..\lib\libavutil\crc.h" />
+    <ClInclude Include="..\..\lib\libavutil\dict.h" />
+    <ClInclude Include="..\..\lib\libavutil\error.h" />
+    <ClInclude Include="..\..\lib\libavutil\eval.h" />
+    <ClInclude Include="..\..\lib\libavutil\fifo.h" />
+    <ClInclude Include="..\..\lib\libavutil\file.h" />
+    <ClInclude Include="..\..\lib\libavutil\frame.h" />
+    <ClInclude Include="..\..\lib\libavutil\hmac.h" />
+    <ClInclude Include="..\..\lib\libavutil\imgutils.h" />
+    <ClInclude Include="..\..\lib\libavutil\intfloat.h" />
+    <ClInclude Include="..\..\lib\libavutil\intfloat_readwrite.h" />
+    <ClInclude Include="..\..\lib\libavutil\intreadwrite.h" />
+    <ClInclude Include="..\..\lib\libavutil\lfg.h" />
+    <ClInclude Include="..\..\lib\libavutil\log.h" />
+    <ClInclude Include="..\..\lib\libavutil\lzo.h" />
+    <ClInclude Include="..\..\lib\libavutil\mathematics.h" />
+    <ClInclude Include="..\..\lib\libavutil\md5.h" />
+    <ClInclude Include="..\..\lib\libavutil\mem.h" />
+    <ClInclude Include="..\..\lib\libavutil\murmur3.h" />
+    <ClInclude Include="..\..\lib\libavutil\old_pix_fmts.h" />
+    <ClInclude Include="..\..\lib\libavutil\opt.h" />
+    <ClInclude Include="..\..\lib\libavutil\parseutils.h" />
+    <ClInclude Include="..\..\lib\libavutil\pixdesc.h" />
+    <ClInclude Include="..\..\lib\libavutil\pixfmt.h" />
+    <ClInclude Include="..\..\lib\libavutil\random_seed.h" />
+    <ClInclude Include="..\..\lib\libavutil\rational.h" />
+    <ClInclude Include="..\..\lib\libavutil\samplefmt.h" />
+    <ClInclude Include="..\..\lib\libavutil\sha.h" />
+    <ClInclude Include="..\..\lib\libavutil\time.h" />
+    <ClInclude Include="..\..\lib\libavutil\timecode.h" />
+    <ClInclude Include="..\..\lib\libavutil\timestamp.h" />
+    <ClInclude Include="..\..\lib\libavutil\version.h" />
+    <ClInclude Include="..\..\lib\libavutil\xtea.h" />
+    <ClInclude Include="..\..\lib\libswresample\swresample.h" />
+    <ClInclude Include="..\..\lib\libswresample\version.h" />
+    <ClInclude Include="..\..\lib\libswscale\swscale.h" />
+    <ClInclude Include="..\..\lib\libswscale\version.h" />
     <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h" />
     <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h" />
     <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h" />
@@ -311,6 +377,12 @@
     <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h" />
     <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h" />
     <ClInclude Include="..\..\lib\lua\lua.h" />
+    <ClInclude Include="..\..\lib\OpenAL\al.h" />
+    <ClInclude Include="..\..\lib\OpenAL\alc.h" />
+    <ClInclude Include="..\..\lib\OpenAL\efx-creative.h" />
+    <ClInclude Include="..\..\lib\OpenAL\EFX-Util.h" />
+    <ClInclude Include="..\..\lib\OpenAL\efx.h" />
+    <ClInclude Include="..\..\lib\OpenAL\xram.h" />
     <ClInclude Include="..\..\lib\zlib\deflate.h" />
     <ClInclude Include="..\..\lib\zlib\infblock.h" />
     <ClInclude Include="..\..\lib\zlib\infcodes.h" />
@@ -388,6 +460,14 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)_wrap.cxx</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).swig</Message>
     </CustomBuild>
+    <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\avdevice-55.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\avfilter-3.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\avformat-55.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\avutil-52.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\postproc-52.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\swresample-0.def" />
+    <None Include="..\..\lib\OpenAL\lib\x86\swscale-2.def" />
     <None Include="..\..\lib\swig.bat" />
     <None Include="..\..\Player.swig">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call "../../lib/swig" "%(FileName)" %(RelativeDir) "%(FileName)%(Extension)" "%(FullPath)" "$(SolutionDir)" %(Filename)_wrap.cxx</Command>
@@ -395,6 +475,17 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).swig</Message>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\lib\OpenAL\lib\OpenAL\OpenAL32.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\avcodec.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\avdevice.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\avfilter.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\avformat.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\avutil.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\postproc.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\swresample.lib" />
+    <Library Include="..\..\lib\OpenAL\lib\x86\swscale.lib" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>