diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-11-01 03:25:55 -0700 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-11-01 03:25:55 -0700 |
| commit | bc1847a03287fddd8f24d26855c909e78bd1f2bc (patch) | |
| tree | 4cb026d1dadd9540513c6247df57d788a8391346 /project | |
| parent | c3999599939021778a33757429d61d92f150ece7 (diff) | |
| parent | 16fa115c11af4d64e0137433ba01fb4da9318f38 (diff) | |
Merge pull request #3488 from Karlson2k/win32_env_path_fix_01
[win32] Fix win32 VS debugging environment
Diffstat (limited to 'project')
| -rw-r--r-- | project/BuildDependencies/scripts/0_package.list | 2 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/libcdio_d.bat | 4 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 6 |
3 files changed, 2 insertions, 10 deletions
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% diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 390e06993a..5e9fbb5e55 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)..\..
PATH=$(SolutionDir)..\Win32BuildSetup\dependencies;%PATH%</LocalDebuggerEnvironment> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> |