[vlc-commits] [Git][videolan/vlc][master] 5 commits: meson: remove duplicate checks

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
e28d3cb3 by Steve Lhomme at 2023-01-10T14:32:06+00:00
meson: remove duplicate checks

- - - - -
ae3e8204 by Steve Lhomme at 2023-01-10T14:32:06+00:00
meson: fix iphlpapi.h tests

windows.h needs to be included before otherwise some defines are missing

- - - - -
f05aa36d by Steve Lhomme at 2023-01-10T14:32:06+00:00
meson: fix the Windows type of the vlc executable

The entry point is WinMain(), not main().

- - - - -
271de688 by Steve Lhomme at 2023-01-10T14:32:06+00:00
meson: add missing normaliz library

- - - - -
0a5f5444 by Steve Lhomme at 2023-01-10T14:32:06+00:00
meson: fix header used to test functions on Windows

The proper definitions are not found in unistd.h.
It works both for the Windows SDK and mingw-w64.

- - - - -


3 changed files:

- bin/meson.build
- meson.build
- src/meson.build


Changes:

=====================================
bin/meson.build
=====================================
@@ -17,7 +17,8 @@ executable('vlc',
     link_with: [libvlc],
     include_directories: [vlc_include_dirs],
     dependencies: vlc_deps,
-    install: true
+    install: true,
+    win_subsystem: 'windows'
 )
 
 vlc_top_builddir_def = '-DTOP_BUILDDIR="@0@"'.format(vlc_build_root)
@@ -29,5 +30,6 @@ executable('vlc-static',
     include_directories: [vlc_include_dirs],
     dependencies: vlc_deps,
     c_args: [vlc_top_builddir_def, vlc_top_srcdir_def],
-    objc_args: [vlc_top_builddir_def, vlc_top_srcdir_def]
+    objc_args: [vlc_top_builddir_def, vlc_top_srcdir_def],
+    win_subsystem: 'windows'
 )


=====================================
meson.build
=====================================
@@ -218,9 +218,7 @@ check_headers = [
     ['sys/eventfd.h'],
     ['sys/mount.h'],
     ['sys/shm.h'],
-    ['sys/socket.h'],
     ['sys/soundcard.h'],
-    ['sys/uio.h'],
     ['valgrind/valgrind.h'],
     ['X11/Xlib.h'],
     ['xlocale.h'],
@@ -403,10 +401,14 @@ endif
 # will differ based on the platform we're building for
 if host_system == 'windows'
   arpa_inet_h = '#include <ws2tcpip.h>\n#include <windows.h>'
-  net_if_h = '#include <iphlpapi.h>'
+  net_if_h = '#include <windows.h>\n#include <iphlpapi.h>'
+  getpid_h = '#include <process.h>'
+  swab_h   = '#include <stdlib.h>'
 else
   arpa_inet_h = '#include <arpa/inet.h>'
   net_if_h = '#include <net.if.h>'
+  getpid_h = '#include <unistd.h>'
+  swab_h   = '#include <unistd.h>'
 endif
 
 #
@@ -426,6 +428,7 @@ check_functions = [
     ['getmntent_r',      '#include <mntent.h>'],
     ['getpwuid_r',       '#include <pwd.h>'],
     ['isatty',           '#include <unistd.h>'],
+    ['isatty',           '#include <io.h>'],
     ['memalign',         '#include <malloc.h>'],
     ['mkostemp',         '#include <unistd.h>'],
     ['mkostemp',         '#include <stdlib.h>'],
@@ -493,7 +496,7 @@ libcompat_functions = [
     ['flockfile',        '#include <stdio.h>'],
     ['fsync',            '#include <unistd.h>'],
     ['getdelim',         '#include <stdio.h>'],
-    ['getpid',           '#include <unistd.h>'],
+    ['getpid',           getpid_h],
     ['lfind',            '#include <search.h>'],
     ['lldiv',            '#include <stdlib.h>'],
     ['memrchr',          '#include <string.h>'],
@@ -516,7 +519,7 @@ libcompat_functions = [
     ['strtof',           '#include <stdlib.h>'],
     ['strtok_r',         '#include <string.h>'],
     ['strtoll',          '#include <stdlib.h>'],
-    ['swab',             '#include <unistd.h>'],
+    ['swab',             swab_h],
     ['tdestroy',         '#include <search.h>'],
     ['tfind',            '#include <search.h>'],
     ['timegm',           '#include <time.h>'],


=====================================
src/meson.build
=====================================
@@ -42,6 +42,7 @@ if host_system == 'darwin'
 elif host_system == 'windows'
     libvlccore_deps += cc.find_library('bcrypt')
     libvlccore_deps += cc.find_library('winmm')
+    libvlccore_deps += cc.find_library('normaliz')
 endif
 
 #



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d226d830c8bf5ed8b8b99b836a8c63e870116b91...0a5f544457e7c0f41d2ff2d1a14ef33d0d07c35b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d226d830c8bf5ed8b8b99b836a8c63e870116b91...0a5f544457e7c0f41d2ff2d1a14ef33d0d07c35b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance