IIS: Changes Curl version and removes OpenSSL dependency
As the this new Curl version supports well the Windows certificate storage, removing the dependency on the OpenSSL. Also changing the build scripts to work accordingly. As the cmake build of Curl is said to broken abandoning it in favor of the nmake files. Thanks to Gregg Smith and Steffen.
This commit is contained in:
Felipe Zimmerle
Родитель
0d2d01ba2c
Коммит
6c0cdab35a
3
CHANGES
3
CHANGES
|
|
@ -1,6 +1,9 @@
|
|||
DD mmm YYYY - 2.9.????? (To be released)
|
||||
-----------------------
|
||||
|
||||
* OpenSSL dependency was removed on MS Windows builds. ModSecurity is now using
|
||||
the Windows certificate storage.
|
||||
[Gregg Smith, Steffen and ModSecurity team]
|
||||
* Informs about external resources loaded/failed while reloading Apache.
|
||||
[ModSecurity team]
|
||||
* Adds missing 'ModSecurity:' prefix in some warnings messages.
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ LIBS = $(APACHE)\lib\libhttpd.lib \
|
|||
$(APACHE)\lib\libapr-1.lib \
|
||||
$(APACHE)\lib\libaprutil-1.lib \
|
||||
$(PCRE)\pcre.lib \
|
||||
$(CURL)\lib\libcurl_imp.lib \
|
||||
$(CURL)\libcurl.lib \
|
||||
$(LIBXML2)\win32\bin.msvc\libxml2.lib \
|
||||
Ws2_32.lib \
|
||||
"iphlpapi.lib"
|
||||
|
|
@ -32,6 +32,9 @@ INCLUDES = -I. -I.. \
|
|||
-I$(PCRE)\include -I$(PCRE) \
|
||||
-I$(LIBXML2)\include \
|
||||
-I$(APACHE)\include
|
||||
|
||||
# Enables support for SecRemoteRules and external resources.
|
||||
DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
|
||||
|
||||
# Lua is optional
|
||||
!IF "$(LUA)" != ""
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
LIBS = $(APACHE)\lib\libapr-1.lib \
|
||||
$(APACHE)\lib\libaprutil-1.lib \
|
||||
$(PCRE)\pcre.lib \
|
||||
$(CURL)\lib\libcurl_imp.lib \
|
||||
$(CURL)\libcurl.lib \
|
||||
$(LIBXML2)\win32\bin.msvc\libxml2.lib \
|
||||
"kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \
|
||||
"oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \
|
||||
|
|
@ -37,6 +37,8 @@ INCLUDES = -I. -I.. \
|
|||
-I..\apache2 \
|
||||
-I..\standalone
|
||||
|
||||
# Enables support for SecRemoteRules and external resources.
|
||||
DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
|
||||
|
||||
# -I$(SSDEEP) \
|
||||
# Lua is optional
|
||||
|
|
|
|||
|
|
@ -13,14 +13,13 @@
|
|||
@set ZLIB=zlib-1.2.8.tar.gz
|
||||
@set LIBXML2=libxml2-2.9.1.tar.gz
|
||||
@set LUA=lua-5.1.5.tar.gz
|
||||
@set CURL=curl-7.33.0.zip
|
||||
@set CURL=curl-7.39.0.zip
|
||||
@set APACHE_SRC=httpd-2.4.6.tar.gz
|
||||
@set APACHE_BIN32=httpd-2.4.6-win32-VC11.zip
|
||||
@set APACHE_BIN64=httpd-2.4.6-win64-VC11.zip
|
||||
@set YAJL=lloyd-yajl-f4b2b1a.zip
|
||||
@set SSDEEP=ssdeep-2.10.tar.gz
|
||||
@set SSDEEP_BIN=ssdeep-2.10.zip
|
||||
@set OPENSSL=openssl-1.0.1j.tar.gz
|
||||
|
||||
:: @set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"
|
||||
:: @set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
|
||||
|
|
@ -71,11 +70,6 @@ call cl 2>&1 | findstr /C:"x64"
|
|||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed_lua
|
||||
@cd "%CURRENT_DIR%"
|
||||
|
||||
@echo # openssl - %OPENSSL%
|
||||
@call dependencies/build_openssl.bat
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed_openssl
|
||||
@cd "%CURRENT_DIR%"
|
||||
|
||||
@echo # curl - %CURL%
|
||||
@call dependencies/build_curl.bat
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed_curl
|
||||
|
|
@ -127,10 +121,6 @@ call cl 2>&1 | findstr /C:"x64"
|
|||
@echo Failed to setup %CURL%...
|
||||
@goto failed
|
||||
|
||||
:build_failed_openssl
|
||||
@echo Failed to setup %OPENSSL%...
|
||||
@goto failed
|
||||
|
||||
:build_failed_yajl
|
||||
@echo Failed to setup %YAJL%...
|
||||
@goto failed
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@ copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%"
|
|||
copy "%OUTPUT_DIR%\zlib1.dll" "%AMD64%"
|
||||
copy "%OUTPUT_DIR%\yajl.dll" "%AMD64%"
|
||||
copy "%OUTPUT_DIR%\fuzzy.dll" "%AMD64%"
|
||||
copy "%OUTPUT_DIR%\libeay32.dll" "%AMD64%"
|
||||
copy "%OUTPUT_DIR%\ssleay32.dll" "%AMD64%"
|
||||
|
||||
set SSDEEP_ARCH="x86"
|
||||
call build_dependencies.bat %VCARGS32%
|
||||
|
|
@ -56,8 +54,6 @@ copy "%OUTPUT_DIR%\pcre.dll" "%X86%"
|
|||
copy "%OUTPUT_DIR%\zlib1.dll" "%X86%"
|
||||
copy "%OUTPUT_DIR%\yajl.dll" "%X86%"
|
||||
copy "%OUTPUT_DIR%\fuzzy.dll" "%X86%"
|
||||
copy "%OUTPUT_DIR%\libeay32.dll" "%X86%"
|
||||
copy "%OUTPUT_DIR%\ssleay32.dll" "%X86%"
|
||||
|
||||
|
||||
:: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR%
|
||||
|
|
|
|||
|
|
@ -1,39 +1,41 @@
|
|||
cd "%WORK_DIR%"
|
||||
|
||||
@if NOT EXIST "%SOURCE_DIR%\%CURL%" goto file_not_found_bin
|
||||
cd "%WORK_DIR%"
|
||||
@if NOT EXIST "%SOURCE_DIR%\%CURL%" goto file_not_found_bin
|
||||
echo "7z..."
|
||||
7z.exe x "%SOURCE_DIR%\%CURL%"
|
||||
7z.exe x "%SOURCE_DIR%\%CURL%"
|
||||
echo "Timeout..."
|
||||
timeout 5
|
||||
echo "Curl..."
|
||||
set CURL_DIR=%CURL:~0,-4%
|
||||
set CURL_DIR=%CURL:~0,-4%
|
||||
echo "Move..."
|
||||
move "%CURL_DIR%" "curl"
|
||||
move "%CURL_DIR%" "curl"
|
||||
echo "Cd..."
|
||||
:: copy /y CMakeLists.txt "curl"
|
||||
CD "curl"
|
||||
echo "Cmake..."
|
||||
CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True -DUSE_SSLEAY=dll -DUSE_OPENSSL=dll -DOPENSSL_ROOT_DIR=%WORK_DIR%/openssl_inst
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
:: "%WORK_DIR%\fart.exe" -r -C "%WORK_DIR%\curl\include\curl\curlbuild.h" LLU ULL
|
||||
NMAKE
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
cd "%WORK_DIR%"
|
||||
|
||||
copy /y "%WORK_DIR%\curl\lib\libcurl.dll" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\curl\lib\libcurl.pdb" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\curl\lib\libcurl_imp.lib" "%OUTPUT_DIR%"
|
||||
|
||||
exit /B 0
|
||||
|
||||
:file_not_found_bin
|
||||
@echo File not found: "%SOURCE_DIR%\%CURL%"
|
||||
@goto failed
|
||||
|
||||
:build_failed
|
||||
@echo Problems during the building phase
|
||||
@goto failed
|
||||
|
||||
:failed
|
||||
@exit /B 1
|
||||
|
||||
CD "curl\winbuild"
|
||||
|
||||
@set ARCH=x86
|
||||
@call cl 2>&1 | findstr /C:"x64"
|
||||
@if (%ERRORLEVEL%) == (0) set ARCH=x64
|
||||
|
||||
nmake /f Makefile.vc mode=dll ENABLE_WINSSL=yes MACHINE=%ARCH% WITH_ZLIB=dll
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
|
||||
cd "%WORK_DIR%"
|
||||
|
||||
copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.dll" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib" "%WORK_DIR%\curl\libcurl.lib"
|
||||
|
||||
exit /B 0
|
||||
|
||||
:file_not_found_bin
|
||||
@echo File not found: "%SOURCE_DIR%\%CURL%"
|
||||
@goto failed
|
||||
|
||||
:build_failed
|
||||
@echo Problems during the building phase
|
||||
@goto failed
|
||||
|
||||
:failed
|
||||
@exit /B 1
|
||||
|
||||
|
||||
->
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
::set WORK_DIR=C:\buildbot\win-local_-_Release\build\ModSecurity\iis\dependencies\build_dir
|
||||
::set SOURCE_DIR=C:\Users\fcosta\Downloads
|
||||
::set OPENSSL=openssl-1.0.1j.tar.gz
|
||||
::set OUTPUT_DIR=C:\buildbot\win-local_-_Release\build\ModSecurity\iis\release_files
|
||||
|
||||
cd "%WORK_DIR%"
|
||||
@if NOT EXIST "%SOURCE_DIR%\%OPENSSL%" goto file_not_found_bin
|
||||
|
||||
echo "7z..."
|
||||
@7z.exe x "%SOURCE_DIR%\%OPENSSL%" -so | 7z.exe x -aoa -si -ttar
|
||||
|
||||
echo "Timeout..."
|
||||
timeout 5
|
||||
|
||||
echo "OpenSSL..."
|
||||
set OPENSSL_DIR=%OPENSSL:~0,-7%
|
||||
|
||||
echo "Move..."
|
||||
move "%OPENSSL_DIR%" "openssl"
|
||||
|
||||
echo "Cd..."
|
||||
cd "openssl"
|
||||
|
||||
|
||||
@set ARCH=x86
|
||||
@call cl 2>&1 | findstr /C:"x64"
|
||||
@if (%ERRORLEVEL%) == (0) set ARCH=x64
|
||||
|
||||
echo "Starting to build"
|
||||
|
||||
if "%ARCH%" == "x64" ( goto first ) else ( goto second )
|
||||
goto end
|
||||
|
||||
:first
|
||||
echo "Building x64"
|
||||
perl Configure VC-WIN64A --prefix=%WORK_DIR%/openssl_inst
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
call ms\do_win64a
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
nmake -f ms\ntdll.mak
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
nmake -f ms\ntdll.mak install
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\libeay32.dll" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.dll" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\libeay32.lib" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.lib" "%OUTPUT_DIR%"
|
||||
goto end
|
||||
|
||||
:second
|
||||
echo "Building x86"
|
||||
perl Configure VC-WIN32 no-asm --prefix=%WORK_DIR%/openssl_inst
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
:: call ms\do_nasm
|
||||
call ms\do_ms
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
nmake -f ms\ntdll.mak
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
nmake -f ms\ntdll.mak install
|
||||
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\libeay32.dll" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.dll" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\libeay32.lib" "%OUTPUT_DIR%"
|
||||
copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.lib" "%OUTPUT_DIR%"
|
||||
goto end
|
||||
|
||||
|
||||
:end
|
||||
exit /B 0
|
||||
|
||||
:file_not_found_bin
|
||||
@echo File not found: "%SOURCE_DIR%\%OPENSSL%"
|
||||
@goto failed
|
||||
|
||||
:: :build_failed
|
||||
:: @echo Problems during the building phase
|
||||
:: @goto failed
|
||||
|
||||
:failed
|
||||
@exit /B 1
|
||||
|
||||
|
|
@ -86,16 +86,6 @@
|
|||
<DirectorySearch Id="CheckFileDir19" Path="C:\Windows\System32\inetsrv" Depth="0">
|
||||
<FileSearch Id="CheckFile19" Name="fuzzy.dll" />
|
||||
</DirectorySearch>
|
||||
<DirectorySearch Id="CheckFileDir20" Path="C:\Windows\System32\inetsrv" Depth="0">
|
||||
<FileSearch Id="CheckFile20" Name="libeay32.dll" />
|
||||
</DirectorySearch>
|
||||
<DirectorySearch Id="CheckFileDir21" Path="C:\Windows\System32\inetsrv" Depth="0">
|
||||
<FileSearch Id="CheckFile21" Name="ssleay32.dll" />
|
||||
</DirectorySearch>
|
||||
<DirectorySearch Id="CheckFileDir22" Path="C:\Windows\System32\inetsrv" Depth="0">
|
||||
<FileSearch Id="CheckFile22" Name="curl-ca-bundle.crt" />
|
||||
</DirectorySearch>
|
||||
|
||||
</Property>
|
||||
<Property Id="WWWROOT">
|
||||
<RegistrySearch Id="FindInetPubFolder" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp" Name="PathWWWRoot" Type="directory" />
|
||||
|
|
@ -336,9 +326,9 @@
|
|||
<Shortcut Id="EULA" Name="EULA" Description="EULA" Target="[INSTALLFOLDER]EULA.rtf" WorkingDirectory="INSTALLFOLDER" />
|
||||
<Shortcut Id="Readme" Name="EULA" Description="EULA" Target="[INSTALLFOLDER]README.TXT" WorkingDirectory="INSTALLFOLDER" />
|
||||
<?if $(var.Win64) = "yes" ?>
|
||||
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments=""[inetsrv64]libapr-1.dll" "[inetsrv64]libapriconv-1.dll" "[inetsrv64]libaprutil-1.dll" "[inetsrv64]libcurl.dll" "[inetsrv64]libxml2.dll" "[inetsrv64]lua5.1.dll" "[inetsrv64]mlogc.exe" "[inetsrv64]ModSecurityIIS.dll" "[inetsrv64]pcre.dll" "[inetsrv64]zlib1.dll" "[inetsrv64]fuzzy.dll" "[inetsrv64]libeay32.dll" "[inetsrv64]ssleay32.dll" "[inetsrv32]libapr-1.dll" "[inetsrv32]libapriconv-1.dll" "[inetsrv32]libaprutil-1.dll" "[inetsrv32]libcurl.dll" "[inetsrv32]libxml2.dll" "[inetsrv32]lua5.1.dll" "[inetsrv32]mlogc.exe" "[inetsrv32]ModSecurityIIS.dll" "[inetsrv32]pcre.dll" "[inetsrv32]zlib1.dll" "[inetsrv32]fuzzy.dll" "[inetsrv32]libeay32.dll" "[inetsrv32]ssleay32.dll"" WorkingDirectory="INSTALLFOLDER" />
|
||||
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments=""[inetsrv64]libapr-1.dll" "[inetsrv64]libapriconv-1.dll" "[inetsrv64]libaprutil-1.dll" "[inetsrv64]libcurl.dll" "[inetsrv64]libxml2.dll" "[inetsrv64]lua5.1.dll" "[inetsrv64]mlogc.exe" "[inetsrv64]ModSecurityIIS.dll" "[inetsrv64]pcre.dll" "[inetsrv64]zlib1.dll" "[inetsrv64]fuzzy.dll" "[inetsrv32]libapr-1.dll" "[inetsrv32]libapriconv-1.dll" "[inetsrv32]libaprutil-1.dll" "[inetsrv32]libcurl.dll" "[inetsrv32]libxml2.dll" "[inetsrv32]lua5.1.dll" "[inetsrv32]mlogc.exe" "[inetsrv32]ModSecurityIIS.dll" "[inetsrv32]pcre.dll" "[inetsrv32]zlib1.dll" "[inetsrv32]fuzzy.dll"" WorkingDirectory="INSTALLFOLDER" />
|
||||
<?else ?>
|
||||
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments=""[inetsrv32]libapr-1.dll" "[inetsrv32]libapriconv-1.dll" "[inetsrv32]libaprutil-1.dll" "[inetsrv32]libcurl.dll" "[inetsrv32]libxml2.dll" "[inetsrv32]lua5.1.dll" "[inetsrv32]mlogc.exe" "[inetsrv32]ModSecurityIIS.dll" "[inetsrv32]pcre.dll" "[inetsrv32]zlib1.dll" "[inetsrv32]fuzzy.dll" "[inetsrv32]libeay32.dll" "[inetsrv32]ssleay32.dll"" WorkingDirectory="INSTALLFOLDER" />
|
||||
<Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments=""[inetsrv32]libapr-1.dll" "[inetsrv32]libapriconv-1.dll" "[inetsrv32]libaprutil-1.dll" "[inetsrv32]libcurl.dll" "[inetsrv32]libxml2.dll" "[inetsrv32]lua5.1.dll" "[inetsrv32]mlogc.exe" "[inetsrv32]ModSecurityIIS.dll" "[inetsrv32]pcre.dll" "[inetsrv32]zlib1.dll" "[inetsrv32]fuzzy.dll"" WorkingDirectory="INSTALLFOLDER" />
|
||||
<?endif ?>
|
||||
</Component>
|
||||
</Directory>
|
||||
|
|
@ -380,9 +370,6 @@
|
|||
<File Id="_64_PCRE" Name="pcre.dll" Source="Release\amd64\pcre.dll" />
|
||||
<File Id="_64_ZLIB1" Name="zlib1.dll" Source="Release\amd64\zlib1.dll" />
|
||||
<File Id="_64_FUZZY" Name="fuzzy.dll" Source="Release\amd64\fuzzy.dll" />
|
||||
<File Id="_64_LIBEAY" Name="libeay32.dll" Source="Release\amd64\libeay32.dll" />
|
||||
<File Id="_64_SSLEAY" Name="ssleay32.dll" Source="Release\amd64\ssleay32.dll" />
|
||||
<File Id="_64_CA_BUNDLE" Name="curl-ca-bundle.crt" Source="curl-ca-bundle.crt" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
<DirectoryRef Id="inetsrv32">
|
||||
|
|
@ -399,9 +386,6 @@
|
|||
<File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
|
||||
<File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
|
||||
<File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
|
||||
<File Id="_32_LIBEAY" Name="libeay32.dll" Source="Release\x86\libeay32.dll" />
|
||||
<File Id="_32_SSLEAY" Name="ssleay32.dll" Source="Release\x86\ssleay32.dll" />
|
||||
<File Id="_32_CA_BUNDLE" Name="curl-ca-bundle.crt" Source="curl-ca-bundle.crt" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
<DirectoryRef Id="SystemFolderConfigSchema32">
|
||||
|
|
@ -429,9 +413,6 @@
|
|||
<File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
|
||||
<File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
|
||||
<File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
|
||||
<File Id="_32_LIBEAY" Name="libeay32.dll" Source="Release\x86\libeay32.dll" />
|
||||
<File Id="_32_SSLEAY" Name="ssleay32.dll" Source="Release\x86\ssleay32.dll" />
|
||||
<File Id="_32_CA_BUNDLE" Name="curl-ca-bundle.crt" Source="curl-ca-bundle.crt" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
<DirectoryRef Id="SystemFolderConfigSchema32">
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib;</AdditionalDependencies>
|
||||
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib;</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>
|
||||
</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib;</AdditionalDependencies>
|
||||
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib;</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>
|
||||
</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib;</AdditionalDependencies>
|
||||
<AdditionalDependencies>kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib;</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>
|
||||
</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
|
|
@ -121,4 +121,4 @@
|
|||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ CURL = %CURL%
|
|||
LIBS = $(BASE)\lib\libapr-1.lib \
|
||||
$(BASE)\lib\libaprutil-1.lib \
|
||||
$(PCRE)\pcre.lib \
|
||||
$(CURL)\lib\libcurl_imp.lib \
|
||||
$(CURL)\libcurl.lib \
|
||||
wsock32.lib
|
||||
|
||||
###########################################################################
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче