From f715587d597408a9f99d0c52e8251994b13bd4d6 Mon Sep 17 00:00:00 2001
From: Karlson2k <k2k@narod.ru>
Date: Thu, 24 Oct 2013 04:55:54 +0400
Subject: [win32] Fix win32 VS debugging environment. No need anymore to copy
 dlls to Debug/Release dirs.

---
 project/VS2010Express/XBMC.vcxproj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'project')

diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 65ec4a0dab..224d2e3604 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -55,11 +55,7 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup>
-    <LocalDebuggerEnvironment Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">XBMC_HOME=$(SolutionDir)..\..</LocalDebuggerEnvironment>
-    <LocalDebuggerEnvironment Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">XBMC_HOME=$(SolutionDir)..\..</LocalDebuggerEnvironment>
-    <LocalDebuggerEnvironment Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">XBMC_HOME=$(SolutionDir)..\..</LocalDebuggerEnvironment>
-    <LocalDebuggerEnvironment Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">XBMC_HOME=$(SolutionDir)..\..</LocalDebuggerEnvironment>
-    <LocalDebuggerEnvironment Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">XBMC_HOME=$(SolutionDir)..\..</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>XBMC_HOME=$(SolutionDir)..\..&#xD;&#xA;PATH=$(SolutionDir)..\Win32BuildSetup\dependencies;%PATH%</LocalDebuggerEnvironment>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-- 
cgit v1.2.3


From 16fa115c11af4d64e0137433ba01fb4da9318f38 Mon Sep 17 00:00:00 2001
From: Karlson2k <k2k@narod.ru>
Date: Sun, 27 Oct 2013 21:13:26 +0400
Subject: [win32] don't copy .dlls to debug directory

---
 project/BuildDependencies/scripts/0_package.list | 2 +-
 project/BuildDependencies/scripts/libcdio_d.bat  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'project')

diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
index ae244a7052..9ccd896a9c 100644
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.list
@@ -16,6 +16,6 @@ libnfs-1.6.1-win32.7z
 libshairplay-c159ca7-win32.7z
 libssh-0.5.0-1-win32.zip
 pcre-8.33-win32.zip
-python-2.7.5-win32.7z
+python-2.7.5_2-win32.7z
 sqlite-3.7.16.1-win32.7z
 taglib-1.8-win32.7z
diff --git a/project/BuildDependencies/scripts/libcdio_d.bat b/project/BuildDependencies/scripts/libcdio_d.bat
index 2698b9a6eb..0104c6838f 100644
--- a/project/BuildDependencies/scripts/libcdio_d.bat
+++ b/project/BuildDependencies/scripts/libcdio_d.bat
@@ -12,8 +12,4 @@ copy libcdio-0.83-win32\lib\libcdio.dll.lib "%CUR_PATH%\lib\" /Y
 copy libcdio-0.83-win32\bin\libcdio-13.dll "%XBMC_PATH%\project\Win32BuildSetup\dependencies\" /Y
 copy libcdio-0.83-win32\bin\libiconv-2.dll "%XBMC_PATH%\project\Win32BuildSetup\dependencies\" /Y
 
-rem for debugging
-copy libcdio-0.83-win32\bin\libcdio-13.dll "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)\" /Y
-copy libcdio-0.83-win32\bin\libiconv-2.dll "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)\" /Y
-
 cd %LOC_PATH%
-- 
cgit v1.2.3