linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2301
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-11-22 19:36:53 +0100
message:
  better def for mingw / mingw64 compat
modified:
  SConstruct
  openssl/build/patch.patch
  openssl/lib/libcrypto.a
  openssl/lib/libssl.a


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-11-21 21:10:46 +0000
+++ SConstruct	2010-11-22 18:36:53 +0000
@@ -148,10 +148,6 @@
 	else:
 		env.Append(CCFLAGS = ['-pipe'])
 
-	if dev.is_win32() and env['arch'] == 'x86':
-		# disable the time64->time32 function conv on mingw64 building for x86
-		env.Append(CPPDEFINES = ['__MINGW_USE_VC2005_COMPAT'])
-
 # MinGW seems to choke on member function calls from lambdas, one has to add "this->".
 # TODO When versions of GCC for MinGW that don't need this workaround are available, remove any
 # mention of "GCC_WTF". Until then, use it to facilitate search & replace.

=== modified file 'openssl/build/patch.patch'
--- openssl/build/patch.patch	2010-11-21 21:10:46 +0000
+++ openssl/build/patch.patch	2010-11-22 18:36:53 +0000
@@ -6,7 +6,7 @@
  
  # MinGW
 -"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
-+"mingw", "gcc:-g -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -D__MINGW_USE_VC2005_COMPAT -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK::.dll.a",
++"mingw", "gcc:-g -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -D__CRT__NO_INLINE -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK::.dll.a",
  # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
  # compiled with one compiler with application compiled with another
  # compiler. It's possible to engage Applink support in mingw64 build,

=== modified file 'openssl/lib/libcrypto.a'
Binary files openssl/lib/libcrypto.a	2010-11-21 21:10:46 +0000 and openssl/lib/libcrypto.a	2010-11-22 18:36:53 +0000 differ
=== modified file 'openssl/lib/libssl.a'
Binary files openssl/lib/libssl.a	2010-11-21 21:10:46 +0000 and openssl/lib/libssl.a	2010-11-22 18:36:53 +0000 differ