aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorwiso <wiso@svn>2010-03-22 20:39:43 +0000
committerwiso <wiso@svn>2010-03-22 20:39:43 +0000
commite2cd7aab657ec9796dd3235b12bbc6385ef536cf (patch)
tree6a73608494aa19e4883fd5399ad2139a64082f3f /project
parenta7634b8fb9f8cd150f07c7cac5d24e0e92dffc4c (diff)
[WIN32] fixed installer
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28752 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'project')
-rw-r--r--project/Win32BuildSetup/BuildSetup.bat8
-rw-r--r--project/Win32BuildSetup/XBMC for Windows.nsi13
2 files changed, 4 insertions, 17 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index a5054ecd58..e6ac6c391f 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -165,13 +165,7 @@ IF %target%==dx SET buildconfig=Release (DirectX)
xcopy ..\..\language BUILD_WIN32\Xbmc\language /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
rem screensavers currently are xbox only
rem xcopy ..\..\screensavers BUILD_WIN32\Xbmc\screensavers /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
- if %target%==gl (
- xcopy ..\..\visualisations\*_win32.vis BUILD_WIN32\Xbmc\visualisations /Q /I /Y /EXCLUDE:exclude.txt > NUL
- xcopy ..\..\xbmc\visualizations\XBMCProjectM\libprojectM\presets BUILD_WIN32\Xbmc\visualisations\projectM /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
- ) else (
- xcopy ..\..\visualisations\*_win32dx.vis BUILD_WIN32\Xbmc\visualisations /Q /I /Y /EXCLUDE:exclude.txt > NUL
- xcopy ..\..\visualisations\Milkdrop BUILD_WIN32\Xbmc\visualisations\Milkdrop /Q /I /Y /EXCLUDE:exclude.txt > NUL
- )
+ xcopy ..\..\addons BUILD_WIN32\Xbmc\addons /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
xcopy ..\..\system BUILD_WIN32\Xbmc\system /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
xcopy ..\..\media BUILD_WIN32\Xbmc\media /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
xcopy ..\..\sounds BUILD_WIN32\Xbmc\sounds /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index b08c2370d9..2adeceaa9b 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi
@@ -118,16 +118,8 @@ Section "XBMC" SecXBMC
;Turn on overwrite for rest of install
SetOverwrite on
- SetOutPath "$INSTDIR\visualisations"
- !if "${xbmc_target}" == "gl"
- File "${xbmc_root}\Xbmc\visualisations\*_win32.vis"
- SetOutPath "$INSTDIR\visualisations\projectM"
- File /nonfatal /r "${xbmc_root}\Xbmc\visualisations\projectM\*.*"
- !else
- File "${xbmc_root}\Xbmc\visualisations\*_win32dx.vis"
- SetOutPath "$INSTDIR\visualisations\Milkdrop"
- File /nonfatal /r "${xbmc_root}\Xbmc\visualisations\Milkdrop\*.*"
- !endif
+ SetOutPath "$INSTDIR\addons"
+ File /r "${xbmc_root}\Xbmc\addons\*.*"
SetOutPath "$INSTDIR\web"
File /r "${xbmc_root}\Xbmc\web\*.*"
@@ -337,6 +329,7 @@ Section "Uninstall"
RMDir /r "$INSTDIR\sounds"
RMDir /r "$INSTDIR\system"
RMDir /r "$INSTDIR\visualisations"
+ RMDir /r "$INSTDIR\addons"
RMDir /r "$INSTDIR\web"
RMDir /r "$INSTDIR\cache"