diff --git a/.gitignore b/.gitignore index cd58e0f8..cc79e436 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ Output/Songs *.log /Output/Playlists/*.xml /Output/x64/gstreamer/GstreamerHelper.dll +/Output/x86/gstreamer/GstreamerHelper.dll *.tlog *.suo *.obj @@ -35,6 +36,5 @@ Output/Songs *.nativecodeanalysis* *.lastcodeanalysissucceeded /PartyModes/*/*/*.dll - *.Cache -/Output/x86/gstreamer/GstreamerHelper.dll +/GstreamerHelper/bin/* diff --git a/GstreamerHelper/GstreamerHelper.vcxproj b/GstreamerHelper/GstreamerHelper.vcxproj index 42933149..4c8a37a0 100644 --- a/GstreamerHelper/GstreamerHelper.vcxproj +++ b/GstreamerHelper/GstreamerHelper.vcxproj @@ -68,26 +68,29 @@ true - ..\Output\x86\gstreamer\ + bin\$(Configuration)\$(Platform) $(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath) $(MSBuildProjectDirectory)\x86\lib;$(LibraryPath) + false + $(Platform)\$(Configuration)\ true - ..\Output\x64\gstreamer\ + bin\$(Configuration)\$(Platform) $(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath) $(MSBuildProjectDirectory)\x64\lib;$(LibraryPath) ..\CheckingRules.ruleset false - ..\Output\x86\gstreamer\ + bin\$(Configuration)\$(Platform) $(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath) $(MSBuildProjectDirectory)\x86\lib;$(LibraryPath) + $(Platform)\$(Configuration)\ false - ..\Output\x64\gstreamer\ + bin\$(Configuration)\$(Platform) $(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath) $(MSBuildProjectDirectory)\x64\lib;$(LibraryPath) @@ -111,6 +114,12 @@ true gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies) + + xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y + + + Copying binary + @@ -125,6 +134,9 @@ true gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies) + + xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y + @@ -144,6 +156,12 @@ gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies) false + + xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y + + + Copying binary + @@ -164,6 +182,9 @@ true gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies) + + xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y + diff --git a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs index 0793da9f..737c0010 100644 --- a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs +++ b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs @@ -26,13 +26,13 @@ namespace Vocaluxe.Lib.Sound.Gstreamer #region arch #if ARCH_X86 #if WIN - private const string _Dll = "x86\\gstreamer\\gstreamerhelper.dll"; + private const string _Dll = "x86\\gstreamer\\GstreamerHelper.dll"; #endif #endif #if ARCH_X64 #if WIN - private const string _Dll = "x64\\gstreamer\\gstreamerhelper.dll"; + private const string _Dll = "x64\\gstreamer\\GstreamerHelper.dll"; #endif #endif #endregion arch