Commit Graph

14 Commits

Author SHA1 Message Date
eska 2392824dba Remove nocpuid.c from builtin OpenSSL
Since opensslconf.h no longer defines OPENSSL_CPUID_OBJ, OpenSSL defines
OPENSSL_cpuid_setup itself (with the same empty definition)
2016-05-12 17:06:34 +02:00
Rémi Verschelde c7292b1f3d OpenSSL buildsystem: actually apply the flag on gcc/clang
Commit 972b0f7 was bogus.
2016-05-11 19:41:52 +02:00
Rémi Verschelde 972b0f78b3 Windows: Fix MinGW argument being passed to MSVC
Fixes #4620
2016-05-11 18:48:04 +02:00
George Marques 2e44e255ed
Add ignore error flag to OpenSSL driver 2016-05-09 12:52:49 -03:00
Ariel Manzur baaa74f215 cloning env for builtin_openssl _and_ openssl :) 2016-05-06 22:43:22 -03:00
Ariel Manzur 62c17d65a8 clonning env for builtin ssl 2016-05-06 22:30:48 -03:00
mrezai ab623c923d Update OpenSSL to 1.0.2h 2016-05-03 23:59:14 +04:30
mrezai e97922f220 Update OpenSSL to version 1.0.2g 2016-04-15 19:03:35 +04:30
mrezai 2cbd850979 Fix OpenSSL compilation on Windows
Fixes #4285.
2016-04-12 07:58:56 +02:00
mrezai c860574d8b Update OpenSSL to version 1.0.1s 2016-04-10 17:48:59 +04:30
ZuBsPaCe b051914032 Fixes Visual Studio 2015 linker error (___iob_func)
The original, uncommited fix simply changed compiler flag /MT to /MD. This
would link the C runtime dynamically instead of statically. This is bad,
because some users would have to install the c runtime before starting the
editor.

You can find alot of info about this error, which can happen after
upgrading to VS 2015, and there are workarounds. But I realized, that the
only place, where iob_func is used, is in e_os.h of the openssl library.
The latest version already contains a workaround. I simply updated the
part in e_os.h.

Reference: https://github.com/openssl/openssl/blob/master/e_os.h#L268
Reference: https://software.intel.com/en-us/forums/intel-parallel-studio-beta-archived/topic/266345
Reference: https://connect.microsoft.com/VisualStudio/feedback/details/1144980/error-lnk2001-unresolved-external-symbol-imp-iob-func
Reference: http://stackoverflow.com/questions/757418/should-i-compile-with-md-or-mt

Here's the original error message:

   Creating library bin\godot.windows.tools.lib and object bin\godot.windows.tools.exp
drivers1.windows.tools.lib(t1_enc.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(txt_db.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(d1_enc.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(ui_openssl.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(cryptlib.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(pem_lib.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(d1_both.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
drivers1.windows.tools.lib(rsa_sign.windows.tools.obj) : error LNK2001: unresolved external symbol ___iob_func
bin\godot.windows.tools.exe : fatal error LNK1120: 1 unresolved externals
scons: *** [bin\godot.windows.tools.exe] Error 1120
2015-10-30 03:03:05 +01:00
Juan Linietsky fbdd925d9b -Work in progress visual shader editor *DOES NOT WORK YET* 2015-01-03 16:52:37 -03:00
Theo Hallenius d98d3fb8ea Someone fixed compiling issue on Win 2014-08-27 23:21:24 +02:00
Juan Linietsky 678948068b Small Issues & Maintenance
-=-=-=-=-=-=-=-=-=-=-=-=-=

-Begin work on Navigation Meshes (simple pathfinding for now, will improve soon)
-More doc on theme overriding
-Upgraded OpenSSL to version without bugs
-Misc bugfixes
2014-08-01 22:10:38 -03:00