From f5095433e709bcedfb2df8bc36fd247fc471e2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Fri, 3 Jul 2020 14:59:37 -0300 Subject: [PATCH 1/4] Enabling emile --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index 5d8e1f6638..dab587925d 100644 --- a/meson.build +++ b/meson.build @@ -514,7 +514,6 @@ if sys_windows 'elementary', 'elua', 'embryo', - 'emile', 'emotion', 'ephysics', 'ethumb', From c0f9704f6511086492805bde4fc167f2844e4280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Tue, 9 Jun 2020 15:27:47 -0300 Subject: [PATCH 2/4] Fixing missing include directory for crypto on windows adding ssl lib to crypto dependency Alternative using link_args instead dependencies using compile_args instead of include_directories --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index dab587925d..852c4ca406 100644 --- a/meson.build +++ b/meson.build @@ -339,7 +339,10 @@ elif (get_option('crypto') == 'gnutls') config_h.set('HAVE_GNUTLS', '1') elif (get_option('crypto') == 'openssl') if (get_option('openssl_dir') != '') - crypto = cc.find_library('crypto', dirs : [get_option('openssl_dir')]) + crypto = declare_dependency( + link_args: ['-L' + get_option('openssl_dir'), '-llibssl_static', '-llibcrypto_static'], + compile_args: ['-I' + get_option('openssl_dir') + '/include'], + ) else crypto = dependency('openssl') endif From c2b059923ed10209a7382d19fd4aa4fbd10feb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Fri, 3 Jul 2020 15:07:03 -0300 Subject: [PATCH 3/4] Adding missing S_ISDIR symbol --- src/lib/emile/emile_cipher_openssl.c | 4 ++++ src/lib/evil/evil_stat.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c index 9fb38bb324..5290454e6d 100644 --- a/src/lib/emile/emile_cipher_openssl.c +++ b/src/lib/emile/emile_cipher_openssl.c @@ -16,6 +16,10 @@ #include "emile_private.h" +#ifdef _MSC_VER +# include /* S_ISDIR */ +#endif + #define MAX_KEY_LEN EVP_MAX_KEY_LENGTH #define MAX_IV_LEN EVP_MAX_IV_LENGTH diff --git a/src/lib/evil/evil_stat.h b/src/lib/evil/evil_stat.h index f06b94dd3f..c7bc8988eb 100644 --- a/src/lib/evil/evil_stat.h +++ b/src/lib/evil/evil_stat.h @@ -17,6 +17,8 @@ # define S_IROTH 0 /* Read others */ # define S_IWOTH 0 /* Write others */ # define S_IXOTH 0 /* Execute others */ + +#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) #endif #endif From e24ca58147aa75f64275493b0335cfcdda1cee9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 10 Jun 2020 01:03:49 -0300 Subject: [PATCH 4/4] Enabling and fixing Nuget dependencies --- native-file-windows.txt | 2 +- win32-deps/meson.build | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/native-file-windows.txt b/native-file-windows.txt index c738c394c9..efa4115420 100644 --- a/native-file-windows.txt +++ b/native-file-windows.txt @@ -11,4 +11,4 @@ endian = 'little' [properties] c_args = ['-D_WIN32_WINNT=0x0601', '-march=x86-64'] cpp_args = ['-D_WIN32_WINNT=0x0601', '-march=x86-64'] -nuget-download = false +nuget-download = true diff --git a/win32-deps/meson.build b/win32-deps/meson.build index 01f958695a..bcf14eb7f3 100644 --- a/win32-deps/meson.build +++ b/win32-deps/meson.build @@ -1,14 +1,16 @@ - if sys_windows # Libjpeg-Turbo - libjpeg_inc = include_directories('Libjpeg-Turbo.1.5.15/build/native/include') - libjpeg_lib = static_library('libjpeg', - include_directories: 'Libjpeg-Turbo.1.5.15/lib/native/v140/windesktop/msvcstl/x64/Release/md' + jpeg_inc_dir = include_directories('Libjpeg-Turbo.1.5.15/build/native/include') + jpeg_lib_dir = 'Libjpeg-Turbo.1.5.15/lib/native/v140/windesktop/msvcstl/x64/Debug/md' + jpeg_lib = cc.find_library('libjpeg-turbo', + dirs: meson.build_root() + '/../win32-deps/' + jpeg_lib_dir, + required: true, ) - libjpeg = declare_dependency( - link_with: freetype_lib, - include_directories: freetype_inc + + jpeg = declare_dependency( + dependencies: jpeg_lib, + include_directories: jpeg_inc_dir, ) endif