[vlc-devel] [PATCH] fix vcproj on winRT branch for arm and x64

Martell Malone martellmalone at gmail.com
Mon Nov 3 19:00:11 CET 2014 

I noticed that we can only build one at a time because the dll's and libs
are at the same location for all platforms.
This patch enables loaded the libraries and includes from different dirs.

I will add a final patch for the scripts to take this into account when
building the 7zip archive.
So this will be a 3 patch series

>From afc0f514e1726e32cc7bf960acf309c65a069857 Mon Sep 17 00:00:00 2001
> From: martell <martellmalone at gmail.com>
> Date: Mon, 3 Nov 2014 17:55:17 +0000
> Subject: [PATCH] load libraries from a different dir for each platform
> ---
>  .../libaccess_winrt_plugin.vcxproj                 | 12 ++++-----
>  .../libdirect2d_winrt_plugin.vcxproj               | 24 ++++++++---------
>  .../libxaudio2_winrt_plugin.WindowsPhone.vcxproj   |  2 +-
>  .../libxaudio2_winrt_plugin.vcxproj                | 24 ++++++++---------
>  wrapper/libVLCX/libVLCX.vcxproj                    | 30
> ++++++++++++----------
>  5 files changed, 48 insertions(+), 44 deletions(-)
> diff --git a/modules/libaccess_winrt_plugin/libaccess_winrt_plugin.vcxproj
> b/modules/libaccess_winrt_plugin/libaccess_winrt_plugin.vcxproj
> index fe0676a..c4acb4c 100644
> --- a/modules/libaccess_winrt_plugin/libaccess_winrt_plugin.vcxproj
> +++ b/modules/libaccess_winrt_plugin/libaccess_winrt_plugin.vcxproj
> @@ -120,7 +120,7 @@
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> @@ -140,7 +140,7 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
> @@ -166,7 +166,7 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> @@ -187,7 +187,7 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
> @@ -209,7 +209,7 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> @@ -230,7 +230,7 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
> diff --git
> a/modules/libdirect2d_winrt_plugin/libdirect2d_winrt_plugin.vcxproj
> b/modules/libdirect2d_winrt_plugin/libdirect2d_winrt_plugin.vcxproj
> index aa23a54..0d63875 100644
> --- a/modules/libdirect2d_winrt_plugin/libdirect2d_winrt_plugin.vcxproj
> +++ b/modules/libdirect2d_winrt_plugin/libdirect2d_winrt_plugin.vcxproj
> @@ -120,13 +120,13 @@
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>d3d11.lib;dxgi.lib;d2d1.lib;dxguid.lib;runtimeobject.lib;vlc.lib;vlccore.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-i686</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\video_output\
> @@ -142,14 +142,14 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>d3d11.lib;dxgi.lib;d2d1.lib;dxguid.lib;runtimeobject.lib;vlc.lib;vlccore.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\video_output\
> @@ -168,13 +168,13 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>d3d11.lib;dxgi.lib;d2d1.lib;dxguid.lib;runtimeobject.lib;vlc.lib;vlccore.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\video_output\
> @@ -190,14 +190,14 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>d3d11.lib;dxgi.lib;d2d1.lib;dxguid.lib;runtimeobject.lib;vlc.lib;vlccore.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\video_output\
> @@ -213,13 +213,13 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>d3d11.lib;dxgi.lib;d2d1.lib;dxguid.lib;runtimeobject.lib;vlc.lib;vlccore.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\video_output\
> @@ -235,14 +235,14 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
>        <DisableSpecificWarnings>28204</DisableSpecificWarnings>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>d3d11.lib;dxgi.lib;d2d1.lib;dxguid.lib;runtimeobject.lib;vlc.lib;vlccore.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\video_output\
> diff --git
> a/modules/libxaudio2_winrt_plugin.WindowsPhone/libxaudio2_winrt_plugin.WindowsPhone.vcxproj
> b/modules/libxaudio2_winrt_plugin.WindowsPhone/libxaudio2_winrt_plugin.WindowsPhone.vcxproj
> index c0d65d6..ef9527c 100644
> ---
> a/modules/libxaudio2_winrt_plugin.WindowsPhone/libxaudio2_winrt_plugin.WindowsPhone.vcxproj
> +++
> b/modules/libxaudio2_winrt_plugin.WindowsPhone/libxaudio2_winrt_plugin.WindowsPhone.vcxproj
> @@ -81,7 +81,7 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
>        <SDLCheck>true</SDLCheck>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>      </ClCompile>
>      <Link>
> diff --git
> a/modules/libxaudio2_winrt_plugin/libxaudio2_winrt_plugin.vcxproj
> b/modules/libxaudio2_winrt_plugin/libxaudio2_winrt_plugin.vcxproj
> index 3597a70..4a348c0 100644
> --- a/modules/libxaudio2_winrt_plugin/libxaudio2_winrt_plugin.vcxproj
> +++ b/modules/libxaudio2_winrt_plugin/libxaudio2_winrt_plugin.vcxproj
> @@ -119,13 +119,13 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions) /D
> "__PLUGIN__"</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;xaudio2.lib;vlccore.lib;vlc.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-i686</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\audio_output
> @@ -140,14 +140,14 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/D "__PLUGIN__" /bigobj
> %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;xaudio2.lib;vlccore.lib;vlc.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-i686</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\audio_output
> @@ -165,13 +165,13 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;xaudio2.lib;vlccore.lib;vlc.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\audio_output
> @@ -186,13 +186,13 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;xaudio2.lib;vlccore.lib;vlc.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\audio_output
> @@ -207,13 +207,13 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;xaudio2.lib;vlccore.lib;vlc.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\audio_output
> @@ -228,13 +228,13 @@ copy /Y $(TargetPath)
> $(SolutionDir)\..\universal\VLC_WINRT_APP\VLC_WINRT_APP.Wi
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include\vlc\plugins;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;xaudio2.lib;vlccore.lib;vlc.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64</AdditionalLibraryDirectories>
>      </Link>
>      <PostBuildEvent>
>        <Command>copy /Y $(TargetPath)
> $(SolutionDir)\ui\plugins\audio_output
> diff --git a/wrapper/libVLCX/libVLCX.vcxproj
> b/wrapper/libVLCX/libVLCX.vcxproj
> index 60b34bc..3b47692 100644
> --- a/wrapper/libVLCX/libVLCX.vcxproj
> +++ b/wrapper/libVLCX/libVLCX.vcxproj
> @@ -119,13 +119,13 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Windows</SubSystem>
>
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;d2d1.lib;dxgi.lib;MMDevAPI.lib;MFuuid.lib;MFReadWrite.lib;MFplat.lib;uuid.lib;WindowsCodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-i686;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
>      </Link>
>    </ItemDefinitionGroup>
>    <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
> @@ -136,14 +136,14 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-i686\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <BrowseInformation>true</BrowseInformation>
>      </ClCompile>
>      <Link>
>        <SubSystem>Windows</SubSystem>
> -
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;dxgi.lib;MMDevAPI.lib;d2d1.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;d2d1.lib;dxgi.lib;MMDevAPI.lib;MFuuid.lib;MFReadWrite.lib;MFplat.lib;uuid.lib;WindowsCodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> -
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-i686;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
>      </Link>
>      <Bscmake>
>        <PreserveSbr>true</PreserveSbr>
> @@ -157,12 +157,13 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> -
>  <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;d2d1.lib;dxgi.lib;MMDevAPI.lib;MFuuid.lib;MFReadWrite.lib;MFplat.lib;uuid.lib;WindowsCodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
>      </Link>
>    </ItemDefinitionGroup>
>    <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
> @@ -173,12 +174,13 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> -
>  <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;d2d1.lib;dxgi.lib;MMDevAPI.lib;MFuuid.lib;MFReadWrite.lib;MFplat.lib;uuid.lib;WindowsCodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-armv7;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
>      </Link>
>    </ItemDefinitionGroup>
>    <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
> @@ -189,12 +191,13 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> -
>  <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;d2d1.lib;dxgi.lib;MMDevAPI.lib;MFuuid.lib;MFReadWrite.lib;MFplat.lib;uuid.lib;WindowsCodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
>      </Link>
>    </ItemDefinitionGroup>
>    <ItemDefinitionGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
> @@ -205,12 +208,13 @@
>
>  <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
>
>  <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>        <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
> -
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
>  <AdditionalIncludeDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>      </ClCompile>
>      <Link>
>        <SubSystem>Console</SubSystem>
> -
>  <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
> +
>  <AdditionalDependencies>runtimeobject.lib;synchronization.lib;vlc.lib;d3d11.lib;d2d1.lib;dxgi.lib;MMDevAPI.lib;MFuuid.lib;MFReadWrite.lib;MFplat.lib;uuid.lib;WindowsCodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
>        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
> +
>  <AdditionalLibraryDirectories>$(ProjectDir)\..\..\vlc\vlc-x86_64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
>      </Link>
>    </ItemDefinitionGroup>
>    <ItemGroup>
> --
> 2.1.3




On Mon, Nov 3, 2014 at 12:27 PM, Martell Malone <martellmalone at gmail.com>
wrote:

> The vcproj for RT were missing the include dirs for arm and x64.
>
>
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20141103/5bf6c7e6/attachment.html>

More information about the vlc-devel mailing list