Commit 124d03f4 authored by Jérémy VIGNELLES's avatar Jérémy VIGNELLES

Switched to the new csproj format

Also moved vlc.h and removed useless code
parent 53e88fd6
<?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk">
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <TargetFrameworks>net47</TargetFrameworks>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <Platforms>AnyCPU;x64;x86</Platforms>
<RootNamespace>Bindings.Tests</RootNamespace>
<AssemblyName>Bindings.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="InstanceTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Moq" Version="4.7.142" />
<PackageReference Include="NUnit" Version="3.8.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Sample\Sample.csproj"> <ProjectReference Include="..\Sample\Sample.csproj" />
<Project>{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}</Project>
<Name>Sample</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("Bindings.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Bindings.Tests")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("1c2511b2-db4e-4a0e-aa3d-f03657bfb691")]
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
<package id="Moq" version="4.7.142" targetFramework="net461" />
<package id="NUnit" version="3.8.1" targetFramework="net461" />
</packages>
\ No newline at end of file
#include <vlc.h> #include <vlc\vlc.h>
extern "C" { void libvlcsharp_generated_symbols1(void* instance) { new (instance) libvlc_module_description_t(); } } extern "C" { void libvlcsharp_generated_symbols1(void* instance) { new (instance) libvlc_module_description_t(); } }
extern "C" { void libvlcsharp_generated_symbols2(void* instance, const libvlc_module_description_t& _0) { new (instance) libvlc_module_description_t(_0); } } extern "C" { void libvlcsharp_generated_symbols2(void* instance, const libvlc_module_description_t& _0) { new (instance) libvlc_module_description_t(_0); } }
......
...@@ -752,8 +752,8 @@ ...@@ -752,8 +752,8 @@
</member> </member>
<member name="M:libvlcsharp.generated.libvlc_media.LibvlcMediaGetStats(libvlcsharp.generated.Media,libvlcsharp.generated.MediaStats)"> <member name="M:libvlcsharp.generated.libvlc_media.LibvlcMediaGetStats(libvlcsharp.generated.Media,libvlcsharp.generated.MediaStats)">
<summary>Get the current statistics about the media</summary> <summary>Get the current statistics about the media</summary>
<param name="p_md::">media descriptor object</param> <param name="p_md:">media descriptor object</param>
<param name="p_stats::"> <param name="p_stats:">
<para>structure that contain the statistics about the media</para> <para>structure that contain the statistics about the media</para>
<para>(this structure must be allocated by the caller)</para> <para>(this structure must be allocated by the caller)</para>
</param> </param>
......
...@@ -5,17 +5,17 @@ namespace Sample ...@@ -5,17 +5,17 @@ namespace Sample
{ {
class Program class Program
{ {
static unsafe void Main(string[] args) static void Main(string[] args)
{ {
var instance = new Instance(0, null); var instance = new Instance(0, null);
//var audiolist = instance.AudioFilterList; //var audiolist = instance.AudioFilterList;
var au = instance.AudioFilters; var au = instance.AudioFilters;
//var media = libvlc_media.LibvlcMediaNewLocation(instance, var media = libvlc_media.LibvlcMediaNewLocation(instance,
// "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4"); "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4");
//var mediaPlayer = libvlc_media_player.LibvlcMediaPlayerNewFromMedia(media); var mediaPlayer = libvlc_media_player.LibvlcMediaPlayerNewFromMedia(media);
//libvlc_media_player.LibvlcMediaPlayerPlay(mediaPlayer); libvlc_media_player.LibvlcMediaPlayerPlay(mediaPlayer);
Console.ReadKey(); Console.ReadKey();
} }
......
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Sample")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Sample")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("fa6cfa75-231b-4643-b82a-f88a08f0f3f9")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
<?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>Sample</RootNamespace> <TargetFrameworks>net47</TargetFrameworks>
<AssemblyName>Sample</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>7.1</LangVersion> <Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup> <RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Reference Include="CppSharp.Runtime">
<HintPath>..\..\CppSharp\build\vs2017\lib\Release_x86\CppSharp.Runtime.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Generated\deprecated.cs" />
<Compile Include="Generated\libvlc.cs" />
<Compile Include="Generated\libvlc_dialog.cs" />
<Compile Include="Generated\libvlc_events.cs" />
<Compile Include="Generated\libvlc_media.cs" />
<Compile Include="Generated\libvlc_media_discoverer.cs" />
<Compile Include="Generated\libvlc_media_library.cs" />
<Compile Include="Generated\libvlc_media_list.cs" />
<Compile Include="Generated\libvlc_media_list_player.cs" />
<Compile Include="Generated\libvlc_media_player.cs" />
<Compile Include="Generated\libvlc_renderer_discoverer.cs" />
<Compile Include="Generated\libvlc_vlm.cs" />
<Compile Include="Generated\vlc.cs" />
<Compile Include="Manual\deprecated.cs" />
<Compile Include="Manual\Instance.cs" />
<Compile Include="Manual\libvlc.cs" />
<Compile Include="Manual\libvlc_dialog.cs" />
<Compile Include="Manual\libvlc_events.cs" />
<Compile Include="Manual\libvlc_media.cs" />
<Compile Include="Manual\libvlc_media_discoverer.cs" />
<Compile Include="Manual\libvlc_media_library.cs" />
<Compile Include="Manual\libvlc_media_list.cs" />
<Compile Include="Manual\libvlc_media_list_player.cs" />
<Compile Include="Manual\libvlc_media_player.cs" />
<Compile Include="Manual\libvlc_renderer_discoverer.cs" />
<Compile Include="Manual\libvlc_vlm.cs" />
<Compile Include="Manual\Utf8StringMarshaler.cs" />
<Compile Include="Manual\vlc.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.26730.16 VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libvlcsharp", "libvlcsharp\libvlcsharp.csproj", "{22AD1787-F35D-40C6-AEDF-03D4F9728117}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libvlcsharp", "libvlcsharp\libvlcsharp.csproj", "{22AD1787-F35D-40C6-AEDF-03D4F9728117}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bindings.Tests", "Bindings.Tests\Bindings.Tests.csproj", "{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bindings.Tests", "Bindings.Tests\Bindings.Tests.csproj", "{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|x64 = Release|x64 Release|x64 = Release|x64
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|Any CPU.Build.0 = Debug|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|ARM.ActiveCfg = Debug|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x64.ActiveCfg = Debug|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|ARM.Build.0 = Debug|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x64.Build.0 = Debug|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x64.ActiveCfg = Debug|x64
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x64.Build.0 = Debug|x64
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x86.ActiveCfg = Debug|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x86.ActiveCfg = Debug|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x86.Build.0 = Debug|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Debug|x86.Build.0 = Debug|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|Any CPU.ActiveCfg = Release|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|Any CPU.Build.0 = Release|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|Any CPU.Build.0 = Release|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|ARM.ActiveCfg = Release|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x64.ActiveCfg = Release|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|ARM.Build.0 = Release|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x64.Build.0 = Release|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x64.ActiveCfg = Release|x64
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x64.Build.0 = Release|x64
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x86.ActiveCfg = Release|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x86.ActiveCfg = Release|Any CPU
{22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x86.Build.0 = Release|Any CPU {22AD1787-F35D-40C6-AEDF-03D4F9728117}.Release|x86.Build.0 = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|ARM.ActiveCfg = Debug|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|ARM.Build.0 = Debug|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x64.ActiveCfg = Debug|x64 {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x64.ActiveCfg = Debug|x64
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x64.Build.0 = Debug|x64 {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x64.Build.0 = Debug|x64
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x86.ActiveCfg = Debug|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x86.ActiveCfg = Debug|x86
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x86.Build.0 = Debug|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Debug|x86.Build.0 = Debug|x86
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|Any CPU.Build.0 = Release|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|Any CPU.Build.0 = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|ARM.ActiveCfg = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|ARM.Build.0 = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x64.ActiveCfg = Release|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x64.ActiveCfg = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x64.Build.0 = Release|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x64.Build.0 = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x86.ActiveCfg = Release|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x86.ActiveCfg = Release|Any CPU
{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x86.Build.0 = Release|Any CPU {FA6CFA75-231B-4643-B82A-F88A08F0F3F9}.Release|x86.Build.0 = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|ARM.ActiveCfg = Debug|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x64.ActiveCfg = Debug|x64
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|ARM.Build.0 = Debug|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x64.Build.0 = Debug|x64
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x64.ActiveCfg = Debug|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x86.ActiveCfg = Debug|x86
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x64.Build.0 = Debug|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x86.Build.0 = Debug|x86
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x86.ActiveCfg = Debug|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Debug|x86.Build.0 = Debug|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|Any CPU.Build.0 = Release|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|Any CPU.Build.0 = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|ARM.ActiveCfg = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|ARM.Build.0 = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|x64.ActiveCfg = Release|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|x64.ActiveCfg = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|x64.Build.0 = Release|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|x64.Build.0 = Release|Any CPU
{1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|x86.ActiveCfg = Release|Any CPU {1C2511B2-DB4E-4A0E-AA3D-F03657BFB691}.Release|x86.ActiveCfg = Release|Any CPU
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using CppSharp; using CppSharp;
using CppSharp.AST; using CppSharp.AST;
using CppSharp.Generators; using CppSharp.Generators;
...@@ -133,15 +134,13 @@ namespace libvlcsharp ...@@ -133,15 +134,13 @@ namespace libvlcsharp
public void Setup(Driver driver) public void Setup(Driver driver)
{ {
var rootPath = Directory.GetParent(Directory.GetCurrentDirectory()).Parent.Parent.FullName; var rootPath = Directory.GetParent(Assembly.GetExecutingAssembly().Location).Parent.Parent.Parent.FullName;
var libvlcHeaders = Path.Combine(rootPath, "include\\vlc");
var libvlcPluginsHeaders = Path.Combine(rootPath, "include\\vlc\\plugins");
var h = Path.Combine(rootPath, "include"); var h = Path.Combine(rootPath, "include");
var libFolder = Path.Combine(rootPath, "include\\lib"); var libFolder = Path.Combine(rootPath, "include\\lib");
driver.ParserOptions = new ParserOptions driver.ParserOptions = new ParserOptions
{ {
IncludeDirs = new List<string> { libvlcHeaders, libvlcPluginsHeaders, h }, IncludeDirs = new List<string> { h },
//Verbose = true //Verbose = true
}; };
...@@ -155,7 +154,7 @@ namespace libvlcsharp ...@@ -155,7 +154,7 @@ namespace libvlcsharp
var module = options.AddModule("libvlcsharp.generated"); var module = options.AddModule("libvlcsharp.generated");
module.SharedLibraryName = "libvlc"; module.SharedLibraryName = "libvlc";
module.Headers.Add("vlc.h"); module.Headers.Add("vlc\\vlc.h");
module.LibraryDirs.Add(libFolder); module.LibraryDirs.Add(libFolder);
} }
......
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("libvlcsharp")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("libvlcsharp")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("22ad1787-f35d-40c6-aedf-03d4f9728117")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
<?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{22AD1787-F35D-40C6-AEDF-03D4F9728117}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>libvlcsharp</RootNamespace> <TargetFrameworks>net47</TargetFrameworks>
<AssemblyName>libvlcsharp</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.dll</HintPath>
</Reference>
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.AST.dll</HintPath>
</Reference>
<Reference Include="CppSharp.Generator, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Generator.dll</HintPath>
</Reference>
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.dll</HintPath>
</Reference>
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.CLI.dll</HintPath>
</Reference>
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Runtime.dll</HintPath>
</Reference>
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Program.cs" /> <PackageReference Include="CppSharp" Version="0.8.14" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="include\lib\libvlc.lib" />
<None Include="include\lib\libvlccore.lib" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="include\lib\libvlc.dll" />
<Content Include="include\lib\libvlccore.dll" />
<Content Include="include\vlc.h" />
<Content Include="include\vlc\deprecated.h" />
<Content Include="include\vlc\libvlc.h" />
<Content Include="include\vlc\libvlc_dialog.h" />
<Content Include="include\vlc\libvlc_events.h" />
<Content Include="include\vlc\libvlc_media.h" />
<Content Include="include\vlc\libvlc_media_discoverer.h" />
<Content Include="include\vlc\libvlc_media_library.h" />
<Content Include="include\vlc\libvlc_media_list.h" />
<Content Include="include\vlc\libvlc_media_list_player.h" />
<Content Include="include\vlc\libvlc_media_player.h" />
<Content Include="include\vlc\libvlc_renderer_discoverer.h" />
<Content Include="include\vlc\libvlc_version.h" />
<Content Include="include\vlc\libvlc_vlm.h" />
<Content Include="include\vlc\plugins\vlc_about.h" />
<Content Include="include\vlc\plugins\vlc_access.h" />
<Content Include="include\vlc\plugins\vlc_addons.h" />
<Content Include="include\vlc\plugins\vlc_aout.h" />
<Content Include="include\vlc\plugins\vlc_aout_volume.h" />
<Content Include="include\vlc\plugins\vlc_arrays.h" />
<Content Include="include\vlc\plugins\vlc_atomic.h" />
<Content Include="include\vlc\plugins\vlc_avcodec.h" />
<Content Include="include\vlc\plugins\vlc_bits.h" />
<Content Include="include\vlc\plugins\vlc_block.h" />
<Content Include="include\vlc\plugins\vlc_block_helper.h" />
<Content Include="include\vlc\plugins\vlc_boxes.h" />
<Content Include="include\vlc\plugins\vlc_charset.h" />
<Content Include="include\vlc\plugins\vlc_codec.h" />
<Content Include="include\vlc\plugins\vlc_common.h" />
<Content Include="include\vlc\plugins\vlc_config.h" />
<Content Include="include\vlc\plugins\vlc_configuration.h" />
<Content Include="include\vlc\plugins\vlc_config_cat.h" />
<Content Include="include\vlc\plugins\vlc_cpu.h" />
<Content Include="include\vlc\plugins\vlc_demux.h" />
<Content Include="include\vlc\plugins\vlc_dialog.h" />
<Content Include="include\vlc\plugins\vlc_epg.h" />
<Content Include="include\vlc\plugins\vlc_es.h" />
<Content Include="include\vlc\plugins\vlc_es_out.h" />
<Content Include="include\vlc\plugins\vlc_events.h" />
<Content Include="include\vlc\plugins\vlc_filter.h" />
<Content Include="include\vlc\plugins\vlc_fingerprinter.h" />
<Content Include="include\vlc\plugins\vlc_fourcc.h" />
<Content Include="include\vlc\plugins\vlc_fs.h" />
<Content Include="include\vlc\plugins\vlc_gcrypt.h" />
<Content Include="include\vlc\plugins\vlc_http.h" />
<Content Include="include\vlc\plugins\vlc_httpd.h" />
<Content Include="include\vlc\plugins\vlc_image.h" />
<Content Include="include\vlc\plugins\vlc_inhibit.h" />
<Content Include="include\vlc\plugins\vlc_input.h" />
<Content Include="include\vlc\plugins\vlc_input_item.h" />
<Content Include="include\vlc\plugins\vlc_interface.h" />
<Content Include="include\vlc\plugins\vlc_interrupt.h" />
<Content Include="include\vlc\plugins\vlc_keys.h" />
<Content Include="include\vlc\plugins\vlc_keystore.h" />
<Content Include="include\vlc\plugins\vlc_main.h" />
<Content Include="include\vlc\plugins\vlc_md5.h" />
<Content Include="include\vlc\plugins\vlc_media_library.h" />
<Content Include="include\vlc\plugins\vlc_memstream.h" />
<Content Include="include\vlc\plugins\vlc_messages.h" />
<Content Include="include\vlc\plugins\vlc_meta.h" />
<Content Include="include\vlc\plugins\vlc_meta_fetcher.h" />
<Content Include="include\vlc\plugins\vlc_mime.h" />
<Content Include="include\vlc\plugins\vlc_modules.h" />
<Content Include="include\vlc\plugins\vlc_mouse.h" />
<Content Include="include\vlc\plugins\vlc_mtime.h" />
<Content Include="include\vlc\plugins\vlc_network.h" />
<Content Include="include\vlc\plugins\vlc_objects.h" />
<Content Include="include\vlc\plugins\vlc_opengl.h" />
<Content Include="include\vlc\plugins\vlc_picture.h" />
<Content Include="include\vlc\plugins\vlc_picture_fifo.h" />
<Content Include="include\vlc\plugins\vlc_picture_pool.h" />
<Content Include="include\vlc\plugins\vlc_playlist.h" />
<Content Include="include\vlc\plugins\vlc_plugin.h" />
<Content Include="include\vlc\plugins\vlc_probe.h" />
<Content Include="include\vlc\plugins\vlc_rand.h" />
<Content Include="include\vlc\plugins\vlc_renderer_discovery.h" />
<Content Include="include\vlc\plugins\vlc_services_discovery.h" />
<Content Include="include\vlc\plugins\vlc_sout.h" />
<Content Include="include\vlc\plugins\vlc_spu.h" />
<Content Include="include\vlc\plugins\vlc_stream.h" />
<Content Include="include\vlc\plugins\vlc_stream_extractor.h" />
<Content Include="include\vlc\plugins\vlc_strings.h" />
<Content Include="include\vlc\plugins\vlc_subpicture.h" />
<Content Include="include\vlc\plugins\vlc_text_style.h" />
<Content Include="include\vlc\plugins\vlc_threads.h" />
<Content Include="include\vlc\plugins\vlc_tls.h" />
<Content Include="include\vlc\plugins\vlc_url.h" />
<Content Include="include\vlc\plugins\vlc_variables.h" />