From e5af2cfa0605388c5f5b7af1f6db7fcdd06403ea Mon Sep 17 00:00:00 2001
From: charlydoes <charlydoes@svn>
Date: Mon, 15 Feb 2010 20:05:46 +0000
Subject: [WIN32] added: libmicrohttpd files to installer

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27855 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
---
 project/Win32BuildSetup/BuildSetup.bat           | 2 ++
 project/Win32BuildSetup/XBMC for Windows.nsi     | 7 +++++++
 project/Win32BuildSetup/dependencies/getdeps.bat | 8 ++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 project/Win32BuildSetup/dependencies/getdeps.bat

(limited to 'project')

diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index dfca4ef5cc..e399f6d70d 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -148,12 +148,14 @@ IF %target%==dx SET buildconfig=Release (DirectX)
   Echo asound.conf>>exclude.txt
   Echo voicemasks.xml>>exclude.txt
   Echo Lircmap.xml>>exclude.txt
+  Echo getdeps.bat>>exclude.txt
 
   xcopy %EXE% BUILD_WIN32\Xbmc > NUL
   xcopy ..\..\userdata BUILD_WIN32\Xbmc\userdata /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
   copy ..\..\copying.txt BUILD_WIN32\Xbmc > NUL
   copy ..\..\LICENSE.GPL BUILD_WIN32\Xbmc > NUL
   copy ..\..\known_issues.txt BUILD_WIN32\Xbmc > NUL
+  call dependencies\getdeps.bat > NUL
   xcopy dependencies\*.* BUILD_WIN32\Xbmc /Q /I /Y /EXCLUDE:exclude.txt  > NUL
   copy sources.xml BUILD_WIN32\Xbmc\userdata > NUL
   
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi
index b08c2370d9..8feb8c8186 100644
--- a/project/Win32BuildSetup/XBMC for Windows.nsi	
+++ b/project/Win32BuildSetup/XBMC for Windows.nsi	
@@ -329,6 +329,13 @@ Section "Uninstall"
   Delete "$INSTDIR\xbmc.old.log"
   Delete "$INSTDIR\msvcp71.dll"
   Delete "$INSTDIR\msvcr71.dll"
+  Delete "$INSTDIR\libgcrypt-11.dll"
+  Delete "$INSTDIR\libgpg-error-0.dll"
+  Delete "$INSTDIR\libiconv-2.dll"
+  Delete "$INSTDIR\libintl-8.dll"
+  Delete "$INSTDIR\libmicrohttpd-5.dll"
+  Delete "$INSTDIR\libplibc-1.dll"
+  Delete "$INSTDIR\pthreadGC2.dll"
   RMDir /r "$INSTDIR\language"
   RMDir /r "$INSTDIR\media"
   RMDir /r "$INSTDIR\plugins"
diff --git a/project/Win32BuildSetup/dependencies/getdeps.bat b/project/Win32BuildSetup/dependencies/getdeps.bat
new file mode 100644
index 0000000000..df59695a56
--- /dev/null
+++ b/project/Win32BuildSetup/dependencies/getdeps.bat
@@ -0,0 +1,8 @@
+@echo off
+rem copies additional dependencies from lib directories
+
+set CUR_PATH=%cd%
+cd "%~dp0"
+xcopy /Y ..\..\..\lib\libmicrohttpd_win32\bin\*.dll
+cd "%CUR_PATH%"
+set CUR_PATH=
\ No newline at end of file
-- 
cgit v1.2.3