josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ace build on win (without ssl)

Browse Source 
fix g3dlite build on win
fix sockets build on win
removed openssl placeholders (not needed)

--HG--
branch : trunk
This commit is contained in:
Rat
2010-06-08 20:41:52 +02:00
parent 2238007e4e
commit 413af7b21f
7 changed files with 1498 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externals/ace/win/VC90/ace.vcproj
Vendored
+10 -102
View File
@@ -51,7 +51,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /wd 4748 /wd 4244"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\;..\..\..\openssl\include;"
AdditionalIncludeDirectories="..\..\..\;"
PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -76,7 +76,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.lib ..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\libeay32.lib"
OutputFile="$(OutDir)\ACEd.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -140,7 +139,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /wd 4748 /wd 4244"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\;..\..\..\openssl\include;"
AdditionalIncludeDirectories="..\..\..\;"
PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -166,7 +165,6 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
AdditionalDependencies="..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.lib ..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\libeay32.lib"
OutputFile="$(OutDir)\ACEd.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -230,7 +228,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /wd 4748 /wd 4244"
Optimization="2"
AdditionalIncludeDirectories="..\..\..\;..\..\..\openssl\include;"
AdditionalIncludeDirectories="..\..\..\;"
PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -252,7 +250,6 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.lib ..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\libeay32.lib"
OutputFile="$(OutDir)\ACE.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -318,7 +315,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /wd 4748 /wd 4244"
Optimization="2"
AdditionalIncludeDirectories="..\..\..\;..\..\..\openssl\include;"
AdditionalIncludeDirectories="..\..\..\;"
PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -342,7 +339,6 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
AdditionalDependencies="..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\ssleay32.lib ..\..\..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\libeay32.lib"
OutputFile="$(OutDir)\ACE.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -1400,34 +1396,6 @@
RelativePath="..\..\SPIPE_Stream.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Asynch_BIO.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Asynch_Stream.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Context.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Acceptor.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Connector.cpp"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Stream.cpp"
>
</File>
<File
RelativePath="..\..\SString.cpp"
>
@@ -2882,11 +2850,11 @@
>
</File>
<File
RelativePath="..\..\OS_Errno.h"
RelativePath="..\..\os_include\os_errno.h"
>
</File>
<File
RelativePath="..\..\os_include\os_errno.h"
RelativePath="..\..\OS_Errno.h"
>
</File>
<File
@@ -3266,11 +3234,11 @@
>
</File>
<File
RelativePath="..\..\os_include\os_string.h"
RelativePath="..\..\OS_String.h"
>
</File>
<File
RelativePath="..\..\OS_String.h"
RelativePath="..\..\os_include\os_string.h"
>
</File>
<File
@@ -3314,11 +3282,11 @@
>
</File>
<File
RelativePath="..\..\os_include\os_time.h"
RelativePath="..\..\os_include\sys\os_time.h"
>
</File>
<File
RelativePath="..\..\os_include\sys\os_time.h"
RelativePath="..\..\os_include\os_time.h"
>
</File>
<File
@@ -3717,42 +3685,6 @@
RelativePath="..\..\SPIPE_Stream.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Asynch_BIO.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Asynch_Stream.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Context.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Export.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Acceptor.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Connector.h"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Stream.h"
>
</File>
<File
RelativePath="..\..\SSL\sslconf.h"
>
</File>
<File
RelativePath="..\..\SString.h"
>
@@ -5054,30 +4986,6 @@
RelativePath="..\..\SPIPE_Stream.inl"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Asynch_Stream.inl"
>
</File>
<File
RelativePath="..\..\SSL\SSL_Context.inl"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK.inl"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Acceptor.inl"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Connector.inl"
>
</File>
<File
RelativePath="..\..\SSL\SSL_SOCK_Stream.inl"
>
</File>
<File
RelativePath="..\..\SString.inl"
>