aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--project/VS2010Express/XBMC.vcxproj1
-rw-r--r--project/Win32BuildSetup/XBMC for Windows.nsi2
-rw-r--r--tools/windows/packaging/media/xbmc.icobin0 -> 167082 bytes
-rw-r--r--xbmc/win32/XBMC.icobin175305 -> 0 bytes
4 files changed, 2 insertions, 1 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index c640130b51..c6de5ca2b5 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -2746,6 +2746,7 @@
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</ExcludedFromBuild>
+ <AdditionalIncludeDirectories>..\..\tools\windows\packaging\media;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index 94358ecb43..99b35a4853 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi
@@ -46,7 +46,7 @@
;Interface Settings
!define MUI_HEADERIMAGE
- !define MUI_ICON "..\..\xbmc\win32\xbmc.ico"
+ !define MUI_ICON "..\..\tools\windows\packaging\media\xbmc.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "xbmc-left.bmp"
!define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_LINK "Please visit http://xbmc.org for more information."
diff --git a/tools/windows/packaging/media/xbmc.ico b/tools/windows/packaging/media/xbmc.ico
new file mode 100644
index 0000000000..b5caca122f
--- /dev/null
+++ b/tools/windows/packaging/media/xbmc.ico
Binary files differ
diff --git a/xbmc/win32/XBMC.ico b/xbmc/win32/XBMC.ico
deleted file mode 100644
index 508de39bc8..0000000000
--- a/xbmc/win32/XBMC.ico
+++ /dev/null
Binary files differ