Skip to content

[Emile] [Redone] Building with tests #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JPTIZ merged 4 commits into from
Jul 6, 2020
Merged

[Emile] [Redone] Building with tests #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f509543
Enabling emile
joaoantoniocardoso Jul 3, 2020
c0f9704
Fixing missing include directory for crypto on windows
joaoantoniocardoso Jun 9, 2020
c2b0599
Adding missing S_ISDIR symbol
joaoantoniocardoso Jul 3, 2020
e24ca58
Enabling and fixing Nuget dependencies
joaoantoniocardoso Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -514,7 +517,6 @@ if sys_windows
'elementary',
'elua',
'embryo',
'emile',
'emotion',
'ephysics',
'ethumb',
Expand Down
2 changes: 1 addition & 1 deletion native-file-windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions src/lib/emile/emile_cipher_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

#include "emile_private.h"

#ifdef _MSC_VER
# include <evil_private.h> /* S_ISDIR */
#endif

#define MAX_KEY_LEN EVP_MAX_KEY_LENGTH
#define MAX_IV_LEN EVP_MAX_IV_LENGTH

Expand Down
2 changes: 2 additions & 0 deletions src/lib/evil/evil_stat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 9 additions & 7 deletions win32-deps/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down