mirror of
https://gitee.com/acl-dev/acl.git
synced 2024-12-02 20:08:21 +08:00
Merge branch 'master' of github:zhengshuxin/acl into github-zsx-master
This commit is contained in:
commit
bc7d725f5c
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/cgi.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/cgi.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
|
@ -63,7 +63,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/cgi_upload.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -141,7 +140,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/cgi_upload.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib libmysql.lib"
|
||||
OutputFile="$(OutDir)/db_service.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
OutputFile="$(OutDir)/db_service.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
|
@ -71,7 +71,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/verbose:lib"
|
||||
AdditionalDependencies="uxtheme.lib polarssl.lib"
|
||||
AdditionalDependencies="uxtheme.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
IgnoreDefaultLibraryNames="libc"
|
||||
@ -158,7 +158,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="uxtheme.lib polarssl.lib"
|
||||
AdditionalDependencies="uxtheme.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
GenerateDebugInformation="true"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_client2.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -141,7 +140,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_client2.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -224,7 +222,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_client2.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
@ -302,7 +299,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_client2.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_server.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_server.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -219,7 +217,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_server.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -301,7 +298,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_server.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_servlet.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/http_servlet.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libmysql.lib"
|
||||
OutputFile="$(OutDir)/mysql.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -93,7 +92,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy ..\..\..\lib\win32\libmysql.dll $(OutDir)\ /Y
"
|
||||
CommandLine=""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -297,7 +296,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libmysql.lib"
|
||||
OutputFile="$(OutDir)/mysql.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
@ -328,7 +326,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy ..\..\..\lib\win32\libmysql.dll $(OutDir)\ /Y
"
|
||||
CommandLine=""
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
|
@ -62,7 +62,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="ws2_32.lib vld.lib"
|
||||
AdditionalDependencies="ws2_32.lib "
|
||||
OutputFile="rfc2047.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -220,7 +220,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="ws2_32.lib vld.lib"
|
||||
AdditionalDependencies="ws2_32.lib"
|
||||
OutputFile="rfc2047.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
@ -300,7 +300,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="ws2_32.lib vld.lib"
|
||||
AdditionalDependencies="ws2_32.lib"
|
||||
OutputFile="rfc2047.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/rpc_download.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -141,7 +140,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/rpc_download.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -224,7 +222,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/rpc_download.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
@ -302,7 +299,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/rpc_download.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
OutputFile="$(OutDir)/sqlite.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -93,7 +92,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy ..\..\..\lib\win32\sqlite3.dll $(OutDir)\ /Y
copy ..\..\..\lib\win32\iconv.dll $(OutDir)\ /Y
"
|
||||
CommandLine="
"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
OutputFile="$(OutDir)/sqlite.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
@ -172,7 +170,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy ..\..\..\lib\win32\sqlite3.dll $(OutDir)\ /Y
copy ..\..\..\lib\win32\iconv.dll $(OutDir)\ /Y
"
|
||||
CommandLine=""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -222,7 +220,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
OutputFile="$(OutDir)/sqlite.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
@ -302,7 +299,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
OutputFile="$(OutDir)/sqlite.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/ssl_client.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32"
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/ssl_client.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32"
|
||||
|
@ -62,7 +62,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/ssl_server.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32"
|
||||
@ -140,7 +139,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="polarssl.lib"
|
||||
OutputFile="$(OutDir)/ssl_server.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\..\lib\win32;..\..\..\..\dist\lib\win32"
|
||||
@ -403,4 +401,6 @@
|
||||
>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
|
@ -69,7 +69,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="nafxcwd.lib sqlite3.lib"
|
||||
AdditionalDependencies="nafxcwd.lib"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
IgnoreDefaultLibraryNames="nafxcwd.lib"
|
||||
@ -155,7 +155,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
IgnoreDefaultLibraryNames="libcmt"
|
||||
@ -244,7 +243,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
IgnoreDefaultLibraryNames="libcmtd"
|
||||
@ -329,7 +327,6 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="sqlite3.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\win32;..\..\..\dist\lib\win32"
|
||||
GenerateDebugInformation="true"
|
||||
|
Loading…
Reference in New Issue
Block a user