diff options
author | Karlson2k <k2k@narod.ru> | 2015-02-12 18:44:50 +0300 |
---|---|---|
committer | Karlson2k <k2k@narod.ru> | 2015-03-13 20:46:38 +0300 |
commit | 96523d57af45a6e96434779dbfe604ac8f5223f9 (patch) | |
tree | d43bb7cd61fdb48434dfeafe24001e20ea21fead /project | |
parent | bb265b3aefa13eddc786cc5a2c341ab7534d3460 (diff) |
[win32] Update libmicrohttpd package, use static lib for libmicrohttpd
Diffstat (limited to 'project')
-rw-r--r-- | project/BuildDependencies/scripts/0_package.list | 2 | ||||
-rw-r--r-- | project/BuildDependencies/scripts/1_copy_deps_d.bat | 1 | ||||
-rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index df2bb6fc1b..a1de1e25a8 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -26,7 +26,7 @@ libfribidi-0.19.2-win32.7z libiconv-1.14-win32-vc120.7z libjpeg-turbo-1.2.0-win32.7z liblzo-2.04-win32.7z -libmicrohttpd-0.4.5-win32-1.7z +libmicrohttpd-svn-35383-win32-vc120.7z libnfs-1.6.2-win32.7z libogg-vc100-1.2.0-win32.7z libplist-1.7-win32-3.7z diff --git a/project/BuildDependencies/scripts/1_copy_deps_d.bat b/project/BuildDependencies/scripts/1_copy_deps_d.bat index d52304fbf5..5b13c29a0f 100644 --- a/project/BuildDependencies/scripts/1_copy_deps_d.bat +++ b/project/BuildDependencies/scripts/1_copy_deps_d.bat @@ -6,7 +6,6 @@ IF EXIST "%APP_PATH%\system\airplay" rmdir "%APP_PATH%\system\airplay" /S /Q rem create directories 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/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 7dd8bf2178..ad5595dce5 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -91,7 +91,7 @@ <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-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> + <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <EntryPointSymbol> </EntryPointSymbol> @@ -125,7 +125,7 @@ <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-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> + <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> <EntryPointSymbol> @@ -155,7 +155,7 @@ <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)$(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-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> + <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <RandomizedBaseAddress>true</RandomizedBaseAddress> |