[Opalvoip-svn] SF.net SVN: opalvoip:[28645] ptlib/branches/v2_12
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2012-12-05 02:36:22
|
Revision: 28645 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=28645&view=rev Author: rjongbloed Date: 2012-12-05 02:36:14 +0000 (Wed, 05 Dec 2012) Log Message: ----------- Fixed 64 bit compile using OpenSSL. There is an issue with not being able to have 32 and 64 bit versions of OpenSSL at the same time as they use identical DLL names. Fixed for now by statically linking the 64 bit version. Modified Paths: -------------- ptlib/branches/v2_12/include/ptbuildopts.h.in ptlib/branches/v2_12/include/ptlib/msos/ptlib.ignore ptlib/branches/v2_12/src/ptlib/msos/PTLib_2010.vcxproj Modified: ptlib/branches/v2_12/include/ptbuildopts.h.in =================================================================== --- ptlib/branches/v2_12/include/ptbuildopts.h.in 2012-12-05 00:22:51 UTC (rev 28644) +++ ptlib/branches/v2_12/include/ptbuildopts.h.in 2012-12-05 02:36:14 UTC (rev 28645) @@ -248,7 +248,7 @@ // #undef P_SSL -//#undef P_SSL_WIN64 // Need to resolv how to have 32 and 64 bit DLL's at the same time +#undef P_SSL_WIN64 #undef P_SSL_WIN32 #undef P_SSL_WINCE @@ -333,11 +333,11 @@ #endif #ifdef _DEBUG - #define P_SSL_LIB1 "@SSL_WIN64_DIR@/lib/VC/libeay32MTd.lib" - #define P_SSL_LIB2 "@SSL_WIN64_DIR@/lib/VC/ssleay32MTd.lib" + #define P_SSL_LIB1 "@SSL_WIN64_DIR@/lib/VC/static/libeay32MDd.lib" + #define P_SSL_LIB2 "@SSL_WIN64_DIR@/lib/VC/static/ssleay32MDd.lib" #else - #define P_SSL_LIB1 "@SSL_WIN64_DIR@/lib/VC/libeay32MT.lib" - #define P_SSL_LIB2 "@SSL_WIN64_DIR@/lib/VC/ssleay32MT.lib" + #define P_SSL_LIB1 "@SSL_WIN64_DIR@/lib/VC/static/libeay32MD.lib" + #define P_SSL_LIB2 "@SSL_WIN64_DIR@/lib/VC/static/ssleay32MD.lib" #endif #elif P_SSL_WIN32==2 Modified: ptlib/branches/v2_12/include/ptlib/msos/ptlib.ignore =================================================================== --- ptlib/branches/v2_12/include/ptlib/msos/ptlib.ignore 2012-12-05 00:22:51 UTC (rev 28644) +++ ptlib/branches/v2_12/include/ptlib/msos/ptlib.ignore 2012-12-05 02:36:14 UTC (rev 28645) @@ -136,3 +136,84 @@ time @26754 NONAME __tcsncpy_s __tcsnicmp + CLSID_DirectSound @20066 NONAME + CLSID_DirectSound8 @20067 NONAME + CLSID_DirectSoundCapture @20068 NONAME + CLSID_DirectSoundCapture8 @20069 NONAME + CLSID_DirectSoundFullDuplex @20070 NONAME + CLSID_DirectSoundPrivate @20071 NONAME + DS3DALG_HRTF_FULL @20072 NONAME + DS3DALG_HRTF_LIGHT @20073 NONAME + DS3DALG_NO_VIRTUALIZATION @20074 NONAME + DSDEVID_DefaultCapture @20075 NONAME + DSDEVID_DefaultPlayback @20076 NONAME + DSDEVID_DefaultVoiceCapture @20077 NONAME + DSDEVID_DefaultVoicePlayback @20078 NONAME + DSPROPSETID_DirectSoundDevice @20079 NONAME + GUID_All_Objects @20080 NONAME + GUID_DSCFX_CLASS_AEC @20081 NONAME + GUID_DSCFX_CLASS_NS @20082 NONAME + GUID_DSCFX_MS_AEC @20083 NONAME + GUID_DSCFX_MS_NS @20084 NONAME + GUID_DSCFX_SYSTEM_AEC @20085 NONAME + GUID_DSCFX_SYSTEM_NS @20086 NONAME + GUID_DSFX_STANDARD_CHORUS @20087 NONAME + GUID_DSFX_STANDARD_COMPRESSOR @20088 NONAME + GUID_DSFX_STANDARD_DISTORTION @20089 NONAME + GUID_DSFX_STANDARD_ECHO @20090 NONAME + GUID_DSFX_STANDARD_FLANGER @20091 NONAME + GUID_DSFX_STANDARD_GARGLE @20092 NONAME + GUID_DSFX_STANDARD_I3DL2REVERB @20093 NONAME + GUID_DSFX_STANDARD_PARAMEQ @20094 NONAME + GUID_DSFX_WAVES_REVERB @20095 NONAME + HRESULT_FROM_WIN32 @20096 NONAME + IID_IAMFilterGraphCallback @20097 NONAME + IID_IDirectSound @20098 NONAME + IID_IDirectSound3DBuffer @20099 NONAME + IID_IDirectSound3DListener @20100 NONAME + IID_IDirectSound8 @20101 NONAME + IID_IDirectSoundBuffer @20102 NONAME + IID_IDirectSoundBuffer8 @20103 NONAME + IID_IDirectSoundCapture @20104 NONAME + IID_IDirectSoundCaptureBuffer @20105 NONAME + IID_IDirectSoundCaptureBuffer8 @20106 NONAME + IID_IDirectSoundCaptureFXAec @20107 NONAME + IID_IDirectSoundCaptureFXNoiseSuppress @20108 NONAME + IID_IDirectSoundFullDuplex @20109 NONAME + IID_IDirectSoundFXChorus @20110 NONAME + IID_IDirectSoundFXCompressor @20111 NONAME + IID_IDirectSoundFXDistortion @20112 NONAME + IID_IDirectSoundFXEcho @20113 NONAME + IID_IDirectSoundFXFlanger @20114 NONAME + IID_IDirectSoundFXGargle @20115 NONAME + IID_IDirectSoundFXI3DL2Reverb @20116 NONAME + IID_IDirectSoundFXParamEq @20117 NONAME + IID_IDirectSoundFXWavesReverb @20118 NONAME + IID_IDirectSoundNotify @20119 NONAME + IID_IKsPropertySet @20120 NONAME + IID_IReferenceClock @20121 NONAME + IN6_IS_ADDR_LINKLOCAL @20122 NONAME + IN6_IS_ADDR_LOOPBACK @20123 NONAME + IN6_IS_ADDR_MULTICAST @20124 NONAME + IN6_IS_ADDR_SITELOCAL @20125 NONAME + IN6_IS_ADDR_V4COMPAT @20126 NONAME + IN6_IS_ADDR_V4MAPPED @20127 NONAME + IsEqualGUID @20128 NONAME + PTimeGetChar @20129 NONAME + PTimeGetDateOrder @20130 NONAME + PTimeIsDayName @20131 NONAME + PTimeIsMonthName @20132 NONAME + PTimeParse @20133 NONAME + PTimeUngetChar @20134 NONAME + regcomp @20135 NONAME + regerror @20136 NONAME + regexec @20137 NONAME + regfree @20138 NONAME + _GUID_00000000_0000_0000_0000_000000000000 @20144 NONAME + _GUID_12e3cca9_7518_44c5_a5e7_ba5a79cb929e @20145 NONAME + _GUID_2d3d3845_39af_4850_bbf9_40b49780011d @20146 NONAME + _GUID_6c44df74_72b9_4992_a1ec_ef996e0422d4 @20147 NONAME + _GUID_c6e13340_30ac_11d0_a18c_00a0c9118956 @20148 NONAME + _TI2?AVbad_alloc@std@@ @20149 NONAME + _TI2?AVbad_cast@std@@ @20150 NONAME + __mask@@NegDouble@ @20151 NONAME Modified: ptlib/branches/v2_12/src/ptlib/msos/PTLib_2010.vcxproj =================================================================== --- ptlib/branches/v2_12/src/ptlib/msos/PTLib_2010.vcxproj 2012-12-05 00:22:51 UTC (rev 28644) +++ ptlib/branches/v2_12/src/ptlib/msos/PTLib_2010.vcxproj 2012-12-05 02:36:14 UTC (rev 28645) @@ -160,7 +160,6 @@ <ModuleDefinitionFile>$(IntDir)$(TargetName).def</ModuleDefinitionFile> <DelayLoadDLLs>SDL.DLL;LUA5.1.DLL;OPENLDAP.DLL;LIBEAY32.DLL;SSLEAY32.DLL;LIBSASL.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>NotSet</SubSystem> <DataExecutionPrevention> </DataExecutionPrevention> </Link> @@ -199,7 +198,6 @@ <ModuleDefinitionFile>$(IntDir)$(TargetName).def</ModuleDefinitionFile> <DelayLoadDLLs>SDL.DLL;LUA5.1.DLL;OPENLDAP.DLL;LIBEAY32.DLL;SSLEAY32.DLL;LIBSASL.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>NotSet</SubSystem> <DataExecutionPrevention> </DataExecutionPrevention> <AdditionalDependencies>DelayImp.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -222,7 +220,7 @@ <Optimization>MaxSpeed</Optimization> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>PTRACING=1;_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PTRACING=2;_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -246,7 +244,6 @@ <ModuleDefinitionFile>$(IntDir)$(TargetName).def</ModuleDefinitionFile> <DelayLoadDLLs>SDL.DLL;LUA5.1.DLL;OPENLDAP.DLL;LIBEAY32.DLL;SSLEAY32.DLL;LIBSASL.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> <DataExecutionPrevention> </DataExecutionPrevention> <AdditionalDependencies>DelayImp.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -269,7 +266,7 @@ <Optimization>MaxSpeed</Optimization> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>PTRACING=2;P_64BIT;_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PTRACING=2;_DLL;NDEBUG;P_64BIT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -293,7 +290,6 @@ <ModuleDefinitionFile>$(IntDir)$(TargetName).def</ModuleDefinitionFile> <DelayLoadDLLs>SDL.DLL;LUA5.1.DLL;OPENLDAP.DLL;LIBEAY32.DLL;SSLEAY32.DLL;LIBSASL.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> <DataExecutionPrevention> </DataExecutionPrevention> <AdditionalDependencies>DelayImp.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -342,7 +338,6 @@ <ModuleDefinitionFile>$(IntDir)$(TargetName).def</ModuleDefinitionFile> <DelayLoadDLLs>SDL.DLL;LUA5.1.DLL;OPENLDAP.DLL;LIBEAY32.DLL;SSLEAY32.DLL;LIBSASL.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> <DataExecutionPrevention> </DataExecutionPrevention> </Link> @@ -388,7 +383,6 @@ <ModuleDefinitionFile>$(IntDir)$(TargetName).def</ModuleDefinitionFile> <DelayLoadDLLs>SDL.DLL;LUA5.1.DLL;OPENLDAP.DLL;LIBEAY32.DLL;SSLEAY32.DLL;LIBSASL.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> <DataExecutionPrevention> </DataExecutionPrevention> <AdditionalDependencies>DelayImp.lib;%(AdditionalDependencies)</AdditionalDependencies> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |