[mupen64plus-ui-console] 126/172: Imported Upstream version 2.0~rc2+1+b39a4ffc9d54

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit e9bfe5bf80c30188a442e7931f704659d46d10a3
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Jun 5 11:05:16 2013 +0200

    Imported Upstream version 2.0~rc2+1+b39a4ffc9d54
---
 projects/msvc11/mupen64plus-ui-console.sln     | 2 +-
 projects/msvc11/mupen64plus-ui-console.vcxproj | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/projects/msvc11/mupen64plus-ui-console.sln b/projects/msvc11/mupen64plus-ui-console.sln
index 69a5354..907e8db 100644
--- a/projects/msvc11/mupen64plus-ui-console.sln
+++ b/projects/msvc11/mupen64plus-ui-console.sln
@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupen64plus-video-rice", ".
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupen64plus-audio-sdl", "..\..\..\mupen64plus-audio-sdl\projects\msvc11\mupen64plus-audio-sdl.vcxproj", "{96969748-EA54-43FC-8103-A346E9AD98E7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupen64plus-video-glide64mk2", "..\..\..\mupen64plus-video-glide64mk2\projects\msvc10\mupen64plus-video-glide64mk2.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupen64plus-video-glide64mk2", "..\..\..\mupen64plus-video-glide64mk2\projects\msvc11\mupen64plus-video-glide64mk2.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/projects/msvc11/mupen64plus-ui-console.vcxproj b/projects/msvc11/mupen64plus-ui-console.vcxproj
index 59d482b..9ca7f4d 100644
--- a/projects/msvc11/mupen64plus-ui-console.vcxproj
+++ b/projects/msvc11/mupen64plus-ui-console.vcxproj
@@ -20,10 +20,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -74,6 +76,7 @@
       <Message>Copying shared data and libraries to build directory...</Message>
       <Command>copy ..\..\..\mupen64plus-core\data\* "$(OutDir)"
 copy ..\..\..\mupen64plus-video-rice\data\* "$(OutDir)"
+copy ..\..\..\mupen64plus-video-glide64mk2\data\* "$(OutDir)"
 copy ..\..\..\mupen64plus-input-sdl\data\* "$(OutDir)"
 copy ..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\bin\*.dll "$(OutDir)"
 copy ..\..\..\mupen64plus-win32-deps\libpng-1.2.37\bin\*.dll "$(OutDir)"
@@ -105,6 +108,7 @@ copy ..\..\..\mupen64plus-win32-deps\zlib-1.2.3\bin\*.dll "$(OutDir)"
       <Message>Copying shared data and libraries to build directory...</Message>
       <Command>copy ..\..\..\mupen64plus-core\data\* "$(OutDir)"
 copy ..\..\..\mupen64plus-video-rice\data\* "$(OutDir)"
+copy ..\..\..\mupen64plus-video-glide64mk2\data\* "$(OutDir)"
 copy ..\..\..\mupen64plus-input-sdl\data\* "$(OutDir)"
 copy ..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\bin\*.dll "$(OutDir)"
 copy ..\..\..\mupen64plus-win32-deps\libpng-1.2.37\bin\*.dll "$(OutDir)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git