From e98634c10f6f16557def733abcf5bd95d5d97f2f Mon Sep 17 00:00:00 2001 From: WiSo Date: Mon, 4 Apr 2011 20:24:02 +0200 Subject: [WIN32] fixed: forgot that winkde.org provides only dynamic libraries. --- project/BuildDependencies/scripts/libsamplerate_d.bat | 1 + project/BuildDependencies/scripts/libsamplerate_d.txt | 3 ++- project/BuildDependencies/scripts/libsqlite_d.bat | 1 + project/BuildDependencies/scripts/libsqlite_d.txt | 3 ++- project/VS2010Express/XBMC.vcxproj | 2 +- xbmc/win32/Win32DelayedDllLoad.cpp | 12 ++++++++++++ 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/project/BuildDependencies/scripts/libsamplerate_d.bat b/project/BuildDependencies/scripts/libsamplerate_d.bat index 68c6b6f9ff..eb40fc8108 100644 --- a/project/BuildDependencies/scripts/libsamplerate_d.bat +++ b/project/BuildDependencies/scripts/libsamplerate_d.bat @@ -9,5 +9,6 @@ cd %TMP_PATH% copy include\samplerate.h "%CUR_PATH%\include" /Y copy lib\libsamplerate-0.lib "%CUR_PATH%\lib\" /Y +copy bin\libsamplerate-0.dll "%XBMC_PATH%\system\" /Y cd %LOC_PATH% diff --git a/project/BuildDependencies/scripts/libsamplerate_d.txt b/project/BuildDependencies/scripts/libsamplerate_d.txt index 91cc84dd6f..6a0e2d32b1 100644 --- a/project/BuildDependencies/scripts/libsamplerate_d.txt +++ b/project/BuildDependencies/scripts/libsamplerate_d.txt @@ -1,2 +1,3 @@ ; filename mirror of the file source of the file -libsamplerate-vc100-0.1.7-lib.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/libsamplerate-vc100-0.1.7-lib.tar.bz2 \ No newline at end of file +libsamplerate-vc100-0.1.7-lib.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/libsamplerate-vc100-0.1.7-lib.tar.bz2 +libsamplerate-vc100-0.1.7-bin.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/libsamplerate-vc100-0.1.7-bin.tar.bz2 \ No newline at end of file diff --git a/project/BuildDependencies/scripts/libsqlite_d.bat b/project/BuildDependencies/scripts/libsqlite_d.bat index 4839cf015a..a5db8268c4 100644 --- a/project/BuildDependencies/scripts/libsqlite_d.bat +++ b/project/BuildDependencies/scripts/libsqlite_d.bat @@ -9,5 +9,6 @@ cd %TMP_PATH% xcopy include "%CUR_PATH%\include" /E /Q /I /Y copy lib\sqlite3.lib "%CUR_PATH%\lib\" /Y +copy bin\sqlite3.dll "%XBMC_PATH%\system\" /Y cd %LOC_PATH% diff --git a/project/BuildDependencies/scripts/libsqlite_d.txt b/project/BuildDependencies/scripts/libsqlite_d.txt index bfe39ba67c..20ea2a5041 100644 --- a/project/BuildDependencies/scripts/libsqlite_d.txt +++ b/project/BuildDependencies/scripts/libsqlite_d.txt @@ -1,2 +1,3 @@ ; filename mirror of the file source of the file -sqlite-vc100-3.7.2-lib.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/sqlite-vc100-3.7.2-lib.tar.bz2 \ No newline at end of file +sqlite-vc100-3.7.2-lib.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/sqlite-vc100-3.7.2-lib.tar.bz2 +sqlite-vc100-3.7.2-bin.tar.bz2 http://mirrors.xbmc.org/build-deps/win32/ http://winkde.org/pub/kde/ports/win32/releases/stable/4.5.4/sqlite-vc100-3.7.2-bin.tar.bz2 \ No newline at end of file diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 78b094e100..e7c29e0bd2 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -169,7 +169,7 @@ libc;msvcrt;libcmt;msvcrtd;%(IgnoreSpecificDefaultLibraries) - dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;%(DelayLoadDLLs) + dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;libsamplerate-0.dll;%(DelayLoadDLLs) true $(OutDir)XBMC.pdb Windows diff --git a/xbmc/win32/Win32DelayedDllLoad.cpp b/xbmc/win32/Win32DelayedDllLoad.cpp index 7f032a6dc1..5fbbbf0496 100644 --- a/xbmc/win32/Win32DelayedDllLoad.cpp +++ b/xbmc/win32/Win32DelayedDllLoad.cpp @@ -41,6 +41,18 @@ FARPROC WINAPI delayHookNotifyFunc (unsigned dliNotify, PDelayLoadInfo pdli) CStdString strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/ssh.dll"); HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH); return (FARPROC)hMod; + } + if (stricmp(pdli->szDll, "sqlite3.dll") == 0) + { + CStdString strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/sqlite3.dll"); + HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH); + return (FARPROC)hMod; + } + if (stricmp(pdli->szDll, "libsamplerate-0.dll") == 0) + { + CStdString strDll = CSpecialProtocol::TranslatePath("special://xbmcbin/system/libsamplerate-0.dll"); + HMODULE hMod = LoadLibraryEx(strDll.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH); + return (FARPROC)hMod; } break; } -- cgit v1.2.3