Merge pull request #5185 from MartijnKaijser/win32_rebrand

[win32] Rebrand win32 BuildSetup and installer files

26 files changed, 114 insertions, 99 deletions

diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/project/BuildDependencies/DownloadBuildDeps.bat
index ed76ec7dc0..81df45a4bc 100644
--- a/project/BuildDependencies/DownloadBuildDeps.bat
+++ b/project/BuildDependencies/DownloadBuildDeps.bat
@@ -3,7 +3,7 @@
 SETLOCAL
 
 SET CUR_PATH=%CD%
-SET XBMC_PATH=%CD%\..\..
+SET APP_PATH=%CD%\..\..
 SET TMP_PATH=%CD%\scripts\tmp
 
 rem can't run rmdir and md back to back. access denied error otherwise.
diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat
index fa5ca42d16..793309f5b7 100644
--- a/project/BuildDependencies/DownloadMingwBuildEnv.bat
+++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat
@@ -6,7 +6,7 @@ SET MSYS_INSTALL_PATH="%CD%\msys"
 SET MINGW_INSTALL_PATH="%CD%\msys\mingw"
 
 SET CUR_PATH=%CD%
-SET XBMC_PATH=%CD%\..\..
+SET APP_PATH=%CD%\..\..
 SET TMP_PATH=%CD%\scripts\tmp
 
 rem can't run rmdir and md back to back. access denied error otherwise.
@@ -41,7 +41,7 @@ SET FSTAB=%MINGW_INSTALL_PATH%
 SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /mingw>>"%MSYS_INSTALL_PATH%\etc\fstab"
-SET FSTAB=%XBMC_PATH%
+SET FSTAB=%APP_PATH%
 SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /xbmc>>"%MSYS_INSTALL_PATH%\etc\fstab"
diff --git a/project/BuildDependencies/scripts/1_copy_deps_d.bat b/project/BuildDependencies/scripts/1_copy_deps_d.bat
index f6aaa3396c..d52304fbf5 100644
--- a/project/BuildDependencies/scripts/1_copy_deps_d.bat
+++ b/project/BuildDependencies/scripts/1_copy_deps_d.bat
@@ -1,12 +1,12 @@
 @ECHO OFF
 
-IF EXIST "%XBMC_PATH%\system\webserver" rmdir "%XBMC_PATH%\system\webserver" /S /Q
-IF EXIST "%XBMC_PATH%\system\airplay" rmdir "%XBMC_PATH%\system\airplay" /S /Q
+IF EXIST "%APP_PATH%\system\webserver" rmdir "%APP_PATH%\system\webserver" /S /Q
+IF EXIST "%APP_PATH%\system\airplay" rmdir "%APP_PATH%\system\airplay" /S /Q
 
 rem create directories
-IF NOT EXIST "%XBMC_PATH%\system\players\paplayer" md "%XBMC_PATH%\system\players\paplayer"
-IF NOT EXIST "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)" md "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)"
-IF NOT EXIST "%XBMC_PATH%\system\webserver" md "%XBMC_PATH%\system\webserver"
-IF NOT EXIST "%XBMC_PATH%\system\airplay" md "%XBMC_PATH%\system\airplay"
-IF NOT EXIST "%XBMC_PATH%\project\Win32BuildSetup\dependencies" md "%XBMC_PATH%\project\Win32BuildSetup\dependencies"
-IF NOT EXIST "%XBMC_PATH%\system\cdrip" md "%XBMC_PATH%\system\cdrip"
\ No newline at end of file
+IF NOT EXIST "%APP_PATH%\system\players\paplayer" md "%APP_PATH%\system\players\paplayer"
+IF NOT EXIST "%APP_PATH%\project\VS2010Express\Application\Debug" md "%APP_PATH%\project\VS2010Express\Application\Debug"
+IF NOT EXIST "%APP_PATH%\system\webserver" md "%APP_PATH%\system\webserver"
+IF NOT EXIST "%APP_PATH%\system\airplay" md "%APP_PATH%\system\airplay"
+IF NOT EXIST "%APP_PATH%\project\Win32BuildSetup\dependencies" md "%APP_PATH%\project\Win32BuildSetup\dependencies"
+IF NOT EXIST "%APP_PATH%\system\cdrip" md "%APP_PATH%\system\cdrip"
\ No newline at end of file
diff --git a/project/BuildDependencies/scripts/PIL_d.bat b/project/BuildDependencies/scripts/PIL_d.bat
index 5042ffc373..1f5eac21e9 100644
--- a/project/BuildDependencies/scripts/PIL_d.bat
+++ b/project/BuildDependencies/scripts/PIL_d.bat
@@ -2,7 +2,7 @@
 
 SET LOC_PATH=%CD%
 SET FILES=%LOC_PATH%\PIL_d.txt
-SET OUTDIR="%XBMC_PATH%\addons\script.module.pil\lib\PIL"
+SET OUTDIR="%APP_PATH%\addons\script.module.pil\lib\PIL"
 
 CALL dlextract.bat PIL %FILES%
 
diff --git a/project/BuildDependencies/scripts/fontconfig_d.bat b/project/BuildDependencies/scripts/fontconfig_d.bat
index 51c1e440ce..e8543f0bd5 100644
--- a/project/BuildDependencies/scripts/fontconfig_d.bat
+++ b/project/BuildDependencies/scripts/fontconfig_d.bat
@@ -10,7 +10,7 @@ cd %TMP_PATH%
 xcopy include\fontconfig "%CUR_PATH%\include\fontconfig" /E /Q /I /Y
 copy lib\fontconfig.lib "%CUR_PATH%\lib\" /Y
 rem libfontconfig-1.dll requires libexpat-1.dll which is copied by libexpat_d.bat
-copy bin\libfontconfig-1.dll "%XBMC_PATH%\system\players\dvdplayer\"
-copy freetype-2.4.6-1-win32\bin\freetype6.dll "%XBMC_PATH%\system\players\dvdplayer\"
+copy bin\libfontconfig-1.dll "%APP_PATH%\system\players\dvdplayer\"
+copy freetype-2.4.6-1-win32\bin\freetype6.dll "%APP_PATH%\system\players\dvdplayer\"
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/get_formed.cmd b/project/BuildDependencies/scripts/get_formed.cmd
index a3f630fac4..ffe44c10e2 100644
--- a/project/BuildDependencies/scripts/get_formed.cmd
+++ b/project/BuildDependencies/scripts/get_formed.cmd
@@ -51,7 +51,7 @@ FOR /F %%f IN ('dir /B /A:-D "%~n1\*.*"') DO (del "%~n1\%%f" /F /Q || EXIT /B 4)
 
 CALL :setSubStageName Copying %1 to build tree...
 REM Copy only content of extracted ".\packagename\"
-XCOPY "%~n1\*" "%XBMC_PATH%\" /E /I /Y /F /R /H /K || EXIT /B 5
+XCOPY "%~n1\*" "%APP_PATH%\" /E /I /Y /F /R /H /K || EXIT /B 5
 
 dir /A:-D * >NUL 2>NUL && (
 CALL :setSubStageName Post-Cleaning %1...
diff --git a/project/BuildDependencies/scripts/get_mingw_env.bat b/project/BuildDependencies/scripts/get_mingw_env.bat
index b071f56ff9..9228100350 100644
--- a/project/BuildDependencies/scripts/get_mingw_env.bat
+++ b/project/BuildDependencies/scripts/get_mingw_env.bat
@@ -25,6 +25,6 @@ copy xasm.exe "%MINGW_INSTALL_PATH%\bin\xasm.exe" /Y
 copy mads.exe "%MINGW_INSTALL_PATH%\bin\mads.exe" /Y
 rem copy "%MINGW_INSTALL_PATH%\bin\mingw32-make.exe" "%MINGW_INSTALL_PATH%\bin\make.exe" /Y
 rem xcopy curl-7.21.0-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y
-rem copy curl-7.21.0-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y
+rem copy curl-7.21.0-devel-mingw32\bin\*.dll "%APP_PATH%\system\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libcdio_d.bat b/project/BuildDependencies/scripts/libcdio_d.bat
index 0104c6838f..550150771f 100644
--- a/project/BuildDependencies/scripts/libcdio_d.bat
+++ b/project/BuildDependencies/scripts/libcdio_d.bat
@@ -9,7 +9,7 @@ cd %TMP_PATH%
 
 xcopy libcdio-0.83-win32\include\* "%CUR_PATH%\include\" /E /Q /I /Y
 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
+copy libcdio-0.83-win32\bin\libcdio-13.dll "%APP_PATH%\project\Win32BuildSetup\dependencies\" /Y
+copy libcdio-0.83-win32\bin\libiconv-2.dll "%APP_PATH%\project\Win32BuildSetup\dependencies\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat
index 0b41b8a8ec..b5104c3cf4 100644
--- a/project/BuildDependencies/scripts/libcec_d.bat
+++ b/project/BuildDependencies/scripts/libcec_d.bat
@@ -10,6 +10,6 @@ cd %TMP_PATH%
 mkdir "%CUR_PATH%\include\libcec"
 xcopy libcec\include\* "%CUR_PATH%\include\libcec\." /E /Q /I /Y
 
-copy libcec\libcec.dll "%XBMC_PATH%\system\."
+copy libcec\libcec.dll "%APP_PATH%\system\."
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libcurl_d.bat b/project/BuildDependencies/scripts/libcurl_d.bat
index ed08aa9d62..5de849bc63 100644
--- a/project/BuildDependencies/scripts/libcurl_d.bat
+++ b/project/BuildDependencies/scripts/libcurl_d.bat
@@ -12,6 +12,6 @@ rem I found no reference to zlib1.dll in any curl dll
 del curl-7.21.6-devel-mingw32\bin\zlib1.dll
 
 xcopy curl-7.21.6-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y
-copy curl-7.21.6-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y
+copy curl-7.21.6-devel-mingw32\bin\*.dll "%APP_PATH%\system\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libexpat_d.bat b/project/BuildDependencies/scripts/libexpat_d.bat
index b14bf04c8a..4d5cb61dcd 100644
--- a/project/BuildDependencies/scripts/libexpat_d.bat
+++ b/project/BuildDependencies/scripts/libexpat_d.bat
@@ -9,8 +9,8 @@ cd %TMP_PATH%
 
 copy include\* "%CUR_PATH%\include\" /Y
 copy lib\expat.lib "%CUR_PATH%\lib\libexpat.lib" /Y
-copy bin\libexpat-1.dll "%XBMC_PATH%\system\libexpat.dll"
+copy bin\libexpat-1.dll "%APP_PATH%\system\libexpat.dll"
 rem libexpat-1.dll for libfontconfig-1.dll which is needed for libass.dll
-copy bin\libexpat-1.dll "%XBMC_PATH%\system\players\dvdplayer\"
+copy bin\libexpat-1.dll "%APP_PATH%\system\players\dvdplayer\"
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libflac_d.bat b/project/BuildDependencies/scripts/libflac_d.bat
index 88ef08dd62..17ac8de62b 100644
--- a/project/BuildDependencies/scripts/libflac_d.bat
+++ b/project/BuildDependencies/scripts/libflac_d.bat
@@ -8,7 +8,7 @@ CALL dlextract.bat libflac %FILES%
 cd %TMP_PATH%
 
 xcopy include\FLAC "%CUR_PATH%\include\FLAC" /E /Q /I /Y
-copy lib\libFLAC.dll "%XBMC_PATH%\system\players\paplayer\" /Y
+copy lib\libFLAC.dll "%APP_PATH%\system\players\paplayer\" /Y
 
 IF EXIST "include\FLAC++" rmdir "include\FLAC++" /S /Q
 IF EXIST "include\ogg" rmdir "include\ogg" /S /Q
diff --git a/project/BuildDependencies/scripts/libmicrohttpd_d.bat b/project/BuildDependencies/scripts/libmicrohttpd_d.bat
index 595e5a7462..7076c87507 100644
--- a/project/BuildDependencies/scripts/libmicrohttpd_d.bat
+++ b/project/BuildDependencies/scripts/libmicrohttpd_d.bat
@@ -8,7 +8,7 @@ CALL dlextract.bat libmicrohttpd %FILES%
 cd %TMP_PATH%
 
 xcopy libmicrohttpd-0.4.5-win32\include\* "%CUR_PATH%\include" /E /Q /I /Y
-xcopy libmicrohttpd-0.4.5-win32\bin\*.dll "%XBMC_PATH%\system\webserver" /E /Q /I /Y
+xcopy libmicrohttpd-0.4.5-win32\bin\*.dll "%APP_PATH%\system\webserver" /E /Q /I /Y
 copy libmicrohttpd-0.4.5-win32\lib\libmicrohttpd.dll.lib "%CUR_PATH%\lib\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/liboggvorbis_d.bat b/project/BuildDependencies/scripts/liboggvorbis_d.bat
index 4abf6d9b9a..0de23091dd 100644
--- a/project/BuildDependencies/scripts/liboggvorbis_d.bat
+++ b/project/BuildDependencies/scripts/liboggvorbis_d.bat
@@ -9,8 +9,8 @@ cd %TMP_PATH%
 
 xcopy include\ogg "%CUR_PATH%\include\ogg" /E /Q /I /Y
 xcopy include\vorbis "%CUR_PATH%\include\vorbis" /E /Q /I /Y
-copy bin\ogg.dll "%XBMC_PATH%\system\cdrip\" /Y
-copy bin\vorbis.dll "%XBMC_PATH%\system\cdrip\" /Y
-copy bin\vorbisfile.dll "%XBMC_PATH%\system\players\paplayer\" /Y
+copy bin\ogg.dll "%APP_PATH%\system\cdrip\" /Y
+copy bin\vorbis.dll "%APP_PATH%\system\cdrip\" /Y
+copy bin\vorbisfile.dll "%APP_PATH%\system\players\paplayer\" /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libplist_d.bat b/project/BuildDependencies/scripts/libplist_d.bat
index f0061b6e5c..53e3c60809 100644
--- a/project/BuildDependencies/scripts/libplist_d.bat
+++ b/project/BuildDependencies/scripts/libplist_d.bat
@@ -8,6 +8,6 @@ CALL dlextract.bat libplist %FILES%
 cd %TMP_PATH%
 
 xcopy libplist-1.7-win32-2\include\* "%CUR_PATH%\include\" /E /Q /I /Y
-xcopy libplist-1.7-win32-2\bin\* "%XBMC_PATH%\system\" /E /Q /I /Y
+xcopy libplist-1.7-win32-2\bin\* "%APP_PATH%\system\" /E /Q /I /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/librtmp_d.bat b/project/BuildDependencies/scripts/librtmp_d.bat
index 717332f68f..c99e1d6d58 100644
--- a/project/BuildDependencies/scripts/librtmp_d.bat
+++ b/project/BuildDependencies/scripts/librtmp_d.bat
@@ -8,6 +8,6 @@ CALL dlextract.bat librtmp %FILES%
 cd %TMP_PATH%
 
 xcopy librtmp-20110723-git-b627335-win32\include\*.h "%CUR_PATH%\include\librtmp\" /E /Q /I /Y
-xcopy librtmp-20110723-git-b627335-win32\lib\*.dll "%XBMC_PATH%\system\players\dvdplayer\" /E /Q /I /Y
+xcopy librtmp-20110723-git-b627335-win32\lib\*.dll "%APP_PATH%\system\players\dvdplayer\" /E /Q /I /Y
 
 cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/libsdl_d.bat b/project/BuildDependencies/scripts/libsdl_d.bat
index a308333aef..601a58e5d9 100644
--- a/project/BuildDependencies/scripts/libsdl_d.bat
+++ b/project/BuildDependencies/scripts/libsdl_d.bat
@@ -10,9 +10,9 @@ cd %TMP_PATH%
 xcopy SDL-1.2.14\include\* "%CUR_PATH%\include\SDL\" /E /Q /I /Y
 copy SDL-1.2.14\lib\SDL.lib "%CUR_PATH%\lib\SDL.lib" /Y
 
-copy SDL-1.2.14\lib\SDL.dll "%XBMC_PATH%\tools\TexturePacker\SDL.dll"
+copy SDL-1.2.14\lib\SDL.dll "%APP_PATH%\tools\TexturePacker\SDL.dll"
 copy SDL_image-1.2.10\include\SDL_image.h "%CUR_PATH%\include\SDL\"
-copy SDL_image-1.2.10\lib\*.dll "%XBMC_PATH%\tools\TexturePacker\"
+copy SDL_image-1.2.10\lib\*.dll "%APP_PATH%\tools\TexturePacker\"
 copy SDL_image-1.2.10\lib\SDL_image.lib "%CUR_PATH%\lib\SDL_image.lib" /Y
 
 
diff --git a/project/BuildDependencies/scripts/zlib_d.bat b/project/BuildDependencies/scripts/zlib_d.bat
index c3ee5ee752..a472ff593e 100644
--- a/project/BuildDependencies/scripts/zlib_d.bat
+++ b/project/BuildDependencies/scripts/zlib_d.bat
@@ -9,6 +9,6 @@ cd %TMP_PATH%
 
 xcopy include\* "%CUR_PATH%\include\" /E /Q /I /Y
 copy lib\zlib.lib "%CUR_PATH%\lib\" /Y
-copy bin\zlib1.dll "%XBMC_PATH%\system\" /Y
+copy bin\zlib1.dll "%APP_PATH%\system\" /Y
 
 cd %LOC_PATH%
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 4af2c43db2..156b08e8a4 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -18,6 +18,7 @@
     <ProjectGuid>{3A68081D-E8F9-4523-9436-530DE9E5530A}</ProjectGuid>
     <RootNamespace>XBMC_PC</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <ProjectName>Kodi</ProjectName>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\XBMC.core-defaults.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -86,12 +87,12 @@
     <Link>
       <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)XBMC.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <IgnoreSpecificDefaultLibraries>libcpmt;libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-55.dll;avfilter-4.dll;avformat-55.dll;avutil-52.dll;postproc-52.dll;swresample-0.dll;swscale-2.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <EntryPointSymbol>
       </EntryPointSymbol>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -118,14 +119,14 @@
     <Link>
       <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;ws2_32.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;strmiids.lib;dxguid.lib;mfuuid.lib;comctl32.lib;yajl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xbmc-test.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName)-test.exe</OutputFile>
       <AdditionalLibraryDirectories>
       </AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
       <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-55.dll;avfilter-4.dll;avformat-55.dll;avutil-52.dll;postproc-52.dll;swresample-0.dll;swscale-2.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <EntryPointSymbol>
       </EntryPointSymbol>
@@ -153,11 +154,11 @@
     <Link>
       <AdditionalOptions>/IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)XBMC.exe</OutputFile>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;msvcprt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-55.dll;avfilter-4.dll;avformat-55.dll;avutil-52.dll;postproc-52.dll;swresample-0.dll;swscale-2.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)XBMC.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <AdditionalLibraryDirectories>..\..\lib\win32\ffmpeg\.libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 70b4e02d28..31e37d99a4 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -1,5 +1,16 @@
 @ECHO OFF
 SETLOCAL ENABLEDELAYEDEXPANSION
+REM setup all paths
+SET cur_dir=%CD%
+SET base_dir=%cur_dir%\..\..
+SET builddeps_dir=%cur_dir%\..\..\project\BuildDependencies
+SET bin_dir=%builddeps_dir%\bin
+SET msys_bin_dir=%builddeps_dir%\msys\bin
+REM read the version values from version.txt
+FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/APP_NAME/ {print $2}" %base_dir%\version.txt') DO SET APP_NAME=%%i
+FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/COMPANY_NAME/ {print $2}" %base_dir%\version.txt') DO SET COMPANY=%%i
+FOR /f %%i IN ('%msys_bin_dir%\awk.exe "/WEBSITE/ {print $2}" %base_dir%\version.txt') DO SET WEBSITE=%%i
+
 rem ----Usage----
 rem BuildSetup [clean|noclean]
 rem clean to force a full rebuild
@@ -8,9 +19,9 @@ rem noprompt to avoid all prompts
 rem nomingwlibs to skip building all libs built with mingw
 CLS
 COLOR 1B
-TITLE XBMC for Windows Build Script
+TITLE %APP_NAME% for Windows Build Script
 rem ----PURPOSE----
-rem - Create a working XBMC build with a single click
+rem - Create a working application build with a single click
 rem -------------------------------------------------------------
 rem Config
 rem If you get an error that Visual studio was not found, SET your path for VSNET main executable.
@@ -49,34 +60,14 @@ set WORKSPACE=%CD%\..\..
 	goto DIE
   )
   
-  set EXE= "..\VS2010Express\XBMC\%buildconfig%\XBMC.exe"
-  set PDB= "..\VS2010Express\XBMC\%buildconfig%\XBMC.pdb"
+  set EXE= "..\VS2010Express\XBMC\%buildconfig%\%APP_NAME%.exe"
+  set PDB= "..\VS2010Express\XBMC\%buildconfig%\%APP_NAME%.pdb"
   
   :: sets the BRANCH env var
   call getbranch.bat
 
   rem	CONFIG END
   rem -------------------------------------------------------------
-
-  echo                         :                                                  
-  echo                        :::                                                 
-  echo                        ::::                                                
-  echo                        ::::                                                
-  echo    :::::::       :::::::::::::::::        ::::::      ::::::        :::::::
-  echo    :::::::::   ::::::::::::::::::::     ::::::::::  ::::::::::    :::::::::
-  echo     ::::::::: ::::::::::::::::::::::   ::::::::::::::::::::::::  ::::::::: 
-  echo          :::::::::     :::      ::::: :::::    ::::::::    :::: :::::      
-  echo           ::::::      ::::       :::: ::::      :::::       :::::::        
-  echo           :::::       ::::        :::::::       :::::       ::::::         
-  echo           :::::       :::         ::::::         :::        ::::::         
-  echo           ::::        :::         ::::::        ::::        ::::::         
-  echo           ::::        :::        :::::::        ::::        ::::::         
-  echo          :::::        ::::       :::::::        ::::        ::::::         
-  echo         :::::::       ::::      ::::::::        :::         :::::::        
-  echo     :::::::::::::::    :::::  ::::: :::         :::         :::::::::      
-  echo  :::::::::  :::::::::  :::::::::::  :::         :::         ::: :::::::::  
-  echo  ::::::::    :::::::::  :::::::::   :::         :::         :::  ::::::::  
-  echo ::::::         :::::::    :::::     :            ::          ::    ::::::  
   goto EXE_COMPILE
 
 :EXE_COMPILE
@@ -131,10 +122,10 @@ set WORKSPACE=%CD%\..\..
   ECHO ------------------------------------------------------------
   ECHO Cleaning Solution...
   %NET% %CLEAN_EXE%
-  ECHO Compiling XBMC branch %BRANCH%...
+  ECHO Compiling %APP_NAME% branch %BRANCH%...
   %NET% %OPTS_EXE%
   IF %errorlevel%==1 (
-  	set DIETEXT="XBMC.EXE failed to build!  See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
+  	set DIETEXT="%APP_NAME%.EXE failed to build!  See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
 	IF %promptlevel%==noprompt (
 		type "%CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
 	)
@@ -148,10 +139,10 @@ set WORKSPACE=%CD%\..\..
 :COMPILE_NO_CLEAN_EXE
   ECHO Wait while preparing the build.
   ECHO ------------------------------------------------------------
-  ECHO Compiling XBMC branch %BRANCH%...
+  ECHO Compiling %APP_NAME% branch %BRANCH%...
   %NET% %OPTS_EXE%
   IF %errorlevel%==1 (
-  	set DIETEXT="XBMC.EXE failed to build!  See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
+  	set DIETEXT="%APP_NAME%.EXE failed to build!  See %CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
 	IF %promptlevel%==noprompt (
 		type "%CD%\..\vs2010express\XBMC\%buildconfig%\objs\XBMC.log"
 	)
@@ -252,7 +243,7 @@ set WORKSPACE=%CD%\..\..
   
   rem restore color and title, some scripts mess these up
   COLOR 1B
-  TITLE XBMC for Windows Build Script
+  TITLE %APP_NAME% for Windows Build Script
 
   IF EXIST exclude.txt del exclude.txt  > NUL
   del /s /q /f BUILD_WIN32\application\*.so  > NUL
@@ -272,8 +263,8 @@ set WORKSPACE=%CD%\..\..
   ECHO ------------------------------------------------------------
   call getdeploydependencies.bat
   CALL extract_git_rev.bat > NUL
-  SET APP_SETUPFILE=XBMCSetup-%GIT_REV%-%BRANCH%.exe
-  SET APP_PDBFILE=XBMCSetup-%GIT_REV%-%BRANCH%.pdb
+  SET APP_SETUPFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%.exe
+  SET APP_PDBFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%.pdb
   ECHO Creating installer %APP_SETUPFILE%...
   IF EXIST %APP_SETUPFILE% del %APP_SETUPFILE% > NUL
   rem get path to makensis.exe from registry, first try tab delim
@@ -312,7 +303,7 @@ set WORKSPACE=%CD%\..\..
   )
 
   SET NSISExe=%NSISExePath%\makensis.exe
-  "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /Dapp_revision="%GIT_REV%" /Dapp_target="%target%" /Dapp_branch="%BRANCH%" "XBMC for Windows.nsi"
+  "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /DAPP_NAME="%APP_NAME%" /DCOMPANY="%COMPANY%" /DWEBSITE="%WEBSITE%" /Dapp_revision="%GIT_REV%" /Dapp_target="%target%" /Dapp_branch="%BRANCH%" "genNsisInstaller.nsi"
   IF NOT EXIST "%APP_SETUPFILE%" (
 	  set DIETEXT=Failed to create %APP_SETUPFILE%. NSIS installed?
 	  goto DIE
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index 2e810512d3..841f8e8237 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -11,10 +11,6 @@
   !include "WinVer.nsh"
   
 ;--------------------------------
-;define global used name
-  !define APP_NAME "XBMC"
-
-;--------------------------------
 ;General
 
   ;Name and file
@@ -45,11 +41,11 @@
 
   !define MUI_HEADERIMAGE
   !define MUI_ICON "..\..\tools\windows\packaging\media\xbmc.ico"
-  !define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp"
-  !define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp"
+  ;!define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp"
+  ;!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp"
   !define MUI_COMPONENTSPAGE_SMALLDESC
-  !define MUI_FINISHPAGE_LINK "Please visit http://xbmc.org for more information."
-  !define MUI_FINISHPAGE_LINK_LOCATION "http://xbmc.org"
+  !define MUI_FINISHPAGE_LINK "Please visit ${WEBSITE} for more information."
+  !define MUI_FINISHPAGE_LINK_LOCATION "${WEBSITE}"
   !define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_NAME}.exe"
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_ABORTWARNING  
@@ -91,7 +87,7 @@ InstType "Minimal" ; 3.
 ;--------------------------------
 ;Installer Sections
 
-Section "XBMC" SecAPP
+Section "${APP_NAME}" SecAPP
   SetShellVarContext current
   SectionIn RO
   SectionIn 1 2 3 #section is in install type Normal/Full/Minimal
@@ -117,6 +113,26 @@ Section "XBMC" SecAPP
   SetOutPath "$INSTDIR\system"
   File /r "${app_root}\application\system\*.*"
   
+  ;Move XBMC portable_data and appdata folder if exists to new location
+  ;and safe clean out old install folder
+  Var /GLOBAL INSTDIR_OLD
+  ReadRegStr $INSTDIR_OLD HKCU "Software\XBMC" ""
+  ${IfNot} $INSTDIR_OLD == ""
+    IfFileExists $INSTDIR_OLD\portable_data\*.* 0 +2
+      Rename "$INSTDIR_OLD\portable_data\" "$INSTDIR\portable_data\"
+      MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND "Your current XBMC portable_data folder was moved to the new installation folder.$\nPlease manually adjust the short-cut for starting ${APP_NAME} accordingly."
+    IfFileExists "$APPDATA\XBMC\*.*" 0 +1
+      Rename "$APPDATA\XBMC\" "$APPDATA\${APP_NAME}\"
+    RMDir /r "$INSTDIR_OLD\addons"
+    RMDir /r "$INSTDIR_OLD\language"
+    RMDir /r "$INSTDIR_OLD\media"
+    RMDir /r "$INSTDIR_OLD\sounds"
+    RMDir /r "$INSTDIR_OLD\system"
+    RMDir /r "$INSTDIR_OLD\userdata"
+    Delete "$INSTDIR_OLD\*.*"
+    RMDir "$INSTDIR_OLD"
+  ${EndIf}
+
   ;Turn off overwrite to prevent files in APPDATA\xbmc\userdata\ from being overwritten
   SetOverwrite off
   IfFileExists $INSTDIR\userdata\*.* 0 +2
@@ -144,9 +160,12 @@ Section "XBMC" SecAPP
     "" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \
     "" "Uninstall ${APP_NAME}."
   
-  WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url" "InternetShortcut" "URL" "http://xbmc.org"
+  WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit ${APP_NAME} Online.url" "InternetShortcut" "URL" "${WEBSITE}"
   !insertmacro MUI_STARTMENU_WRITE_END  
-  
+
+  ;Remove old XBMC shortcuts
+  RMDir /r "$SMPROGRAMS\XBMC"
+
   ;add entry to add/remove programs
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
                  "DisplayName" "${APP_NAME}"
@@ -161,12 +180,12 @@ Section "XBMC" SecAPP
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
                  "DisplayIcon" "$INSTDIR\${APP_NAME}.exe,0"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
-                 "Publisher" "Team XBMC"
+                 "Publisher" "${COMPANY}"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
-                 "HelpLink" "http://xbmc.org/support"
+                 "HelpLink" "${WEBSITE}"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
-                 "URLInfoAbout" "http://xbmc.org"
-                 
+                 "URLInfoAbout" "${WEBSITE}"
+
 SectionEnd
 
 ;*-addons.nsi are generated by genNsisIncludes.bat
@@ -235,16 +254,19 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\sounds"
   RMDir /r "$INSTDIR\system"
   
-;Uninstall User Data if option is checked, otherwise skip
+  ;Un-install User Data if option is checked, otherwise skip
   ${If} $UnPageProfileCheckbox_State == ${BST_CHECKED}
-    RMDir /r "$INSTDIR"
     RMDir /r "$APPDATA\${APP_NAME}\"
+    RMDir /r "$INSTDIR\portable_data\"
   ${Else}
-;Even if userdata is kept in %appdata%\xbmc\userdata, the $INSTDIR\userdata should be cleaned up on uninstall if not used
-;If guisettings.xml exists in the XBMC\userdata directory, do not delete XBMC\userdata directory
-;If that file does not exists, then delete that folder and $INSTDIR
-    IfFileExists $INSTDIR\userdata\guisettings.xml +2
-      RMDir /r "$INSTDIR"
+    ;Check if %appdata%\${APP_NAME}\userdata and portable_data contain no guisettings.xml
+    ;If that file does not exists, then delete those folders and $INSTDIR
+    IfFileExists $INSTDIR\portable_data\userdata\guisettings.xml +2
+      RMDir /r "$INSTDIR\portable_data\"
+      RMDir "$INSTDIR\"
+    IfFileExists "$APPDATA\${APP_NAME}\userdata\guisettings.xml" +2
+      RMDir /r "$APPDATA\${APP_NAME}\userdata\"
+      RMDir "$APPDATA\${APP_NAME}"
   ${EndIf}
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
diff --git a/tools/buildsteps/win32/download-depends.bat b/tools/buildsteps/win32/download-depends.bat
index 6faf963a51..802a65c699 100644
--- a/tools/buildsteps/win32/download-depends.bat
+++ b/tools/buildsteps/win32/download-depends.bat
@@ -4,7 +4,7 @@ SETLOCAL
 
 SET CUR_PATH=%WORKSPACE%\project\BuildDependencies
 SET TMP_PATH=%WORKSPACE%\project\BuildDependencies\scripts\tmp
-SET XBMC_PATH=%WORKSPACE%
+SET APP_PATH=%WORKSPACE%
 
 cd %CUR_PATH%
 
diff --git a/tools/buildsteps/win32/download-msys.bat b/tools/buildsteps/win32/download-msys.bat
index d62f3e9e7a..5e627e41b1 100644
--- a/tools/buildsteps/win32/download-msys.bat
+++ b/tools/buildsteps/win32/download-msys.bat
@@ -3,7 +3,7 @@
 SETLOCAL
 
 SET CUR_PATH=%WORKSPACE%\project\BuildDependencies
-SET XBMC_PATH=%WORKSPACE%
+SET APP_PATH=%WORKSPACE%
 SET TMP_PATH=%CUR_PATH%\scripts\tmp
 
 SET MSYS_INSTALL_PATH="%CUR_PATH%\msys"
@@ -43,7 +43,7 @@ SET FSTAB=%MINGW_INSTALL_PATH%
 SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /mingw>>"%MSYS_INSTALL_PATH%\etc\fstab"
-SET FSTAB=%XBMC_PATH%
+SET FSTAB=%APP_PATH%
 SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /xbmc>>"%MSYS_INSTALL_PATH%\etc\fstab"
diff --git a/version.txt b/version.txt
index f1632f63e6..f5176637fb 100644
--- a/version.txt
+++ b/version.txt
@@ -1,5 +1,6 @@
 APP_NAME Kodi
 COMPANY_NAME Team-Kodi
+WEBSITE http://kodi.tv
 VERSION_MAJOR 14
 VERSION_MINOR 0
 VERSION_TAG ALPHA4
diff --git a/xbmc/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp
index 15d0e40c63..542c211435 100644
--- a/xbmc/win32/WIN32Util.cpp
+++ b/xbmc/win32/WIN32Util.cpp
@@ -408,7 +408,7 @@ std::string CWIN32Util::GetProfilePath()
   CUtil::GetHomePath(strHomePath);
 
   if(g_application.PlatformDirectoriesEnabled())
-    strProfilePath = URIUtils::AddFileToFolder(GetSpecialFolder(CSIDL_APPDATA|CSIDL_FLAG_CREATE), "XBMC");
+    strProfilePath = URIUtils::AddFileToFolder(GetSpecialFolder(CSIDL_APPDATA|CSIDL_FLAG_CREATE), "Kodi");
   else
     strProfilePath = URIUtils::AddFileToFolder(strHomePath , "portable_data");
 
diff --git a/xbmc/win32/XBMC_PC.rc.in b/xbmc/win32/XBMC_PC.rc.in
index 923a1514fb..00194064e8 100644
--- a/xbmc/win32/XBMC_PC.rc.in
+++ b/xbmc/win32/XBMC_PC.rc.in
@@ -72,9 +72,9 @@ BEGIN
             VALUE "CompanyName", "@COMPANY_NAME@"
             VALUE "FileDescription", "@APP_NAME@"
             VALUE "FileVersion", "@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@-@APP_VERSION_TAG@"
-            VALUE "InternalName", "XBMC.exe"
-            VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
-            VALUE "OriginalFilename", "XBMC.exe"
+            VALUE "InternalName", "@APP_NAME@.exe"
+            VALUE "LegalCopyright", "Copyright (c) @COMPANY_NAME@.  All rights reserved."
+            VALUE "OriginalFilename", "@APP_NAME@.exe"
             VALUE "ProductName", "@APP_NAME@ for Windows"
             VALUE "ProductVersion", "@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@-@APP_VERSION_TAG@"
         END