max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 10:46:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11808 from nix-windows/windows-build/meson-windows-version

Browse source 
Set Windows API version in Meson
This commit is contained in:
John Ericson 2024-11-05 10:40:16 -05:00 committed by GitHub
commit ef84fa86f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build-utils-meson/windows-version/meson.build Normal file
View file

@ -0,0 +1,6 @@
if host_machine.system() == 'windows'
# https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
# #define _WIN32_WINNT_WIN8 0x0602
# We currently don't use any API which requires higher than this.
add_project_arguments([ '-D_WIN32_WINNT=0x0602' ], language: 'cpp')
endif

1
src/libexpr-c/meson.build
View file

@ -75,6 +75,7 @@ headers = [config_h] + files(
headers += files('nix_api_expr_internal.h') headers += files('nix_api_expr_internal.h')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nixexprc', 'nixexprc',

1
src/libexpr-test-support/meson.build
View file

@ -56,6 +56,7 @@ headers = files(
) )
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nix-expr-test-support', 'nix-expr-test-support',

1
src/libexpr-tests/meson.build
View file

@ -28,6 +28,7 @@ subdir('build-utils-meson/subprojects')
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck

1
src/libfetchers-tests/meson.build
View file

@ -27,6 +27,7 @@ subdir('build-utils-meson/subprojects')
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck

1
src/libflake-tests/meson.build
View file

@ -27,6 +27,7 @@ subdir('build-utils-meson/subprojects')
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck

1
src/libmain-c/meson.build
View file

@ -68,6 +68,7 @@ headers = [config_h] + files(
) )
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nixmainc', 'nixmainc',

1
src/libstore-c/meson.build
View file

@ -67,6 +67,7 @@ headers = [config_h] + files(
headers += files('nix_api_store_internal.h') headers += files('nix_api_store_internal.h')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nixstorec', 'nixstorec',

1
src/libstore-test-support/meson.build
View file

@ -58,6 +58,7 @@ headers = files(
) )
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nix-store-test-support', 'nix-store-test-support',

1
src/libstore-tests/meson.build
View file

@ -28,6 +28,7 @@ subdir('build-utils-meson/subprojects')
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
sqlite = dependency('sqlite3', 'sqlite', version : '>=3.6.19') sqlite = dependency('sqlite3', 'sqlite', version : '>=3.6.19')
deps_private += sqlite deps_private += sqlite

1
src/libstore/meson.build
View file

@ -410,6 +410,7 @@ foreach name, value : cpp_str_defines
endforeach endforeach
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nixstore', 'nixstore',

1
src/libutil-c/meson.build
View file

@ -63,6 +63,7 @@ headers = [config_h] + files(
headers += files('nix_api_util_internal.h') headers += files('nix_api_util_internal.h')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nixutilc', 'nixutilc',

1
src/libutil-test-support/meson.build
View file

@ -53,6 +53,7 @@ headers = files(
) )
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nix-util-test-support', 'nix-util-test-support',

1
src/libutil-tests/meson.build
View file

@ -28,6 +28,7 @@ subdir('build-utils-meson/subprojects')
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
rapidcheck = dependency('rapidcheck') rapidcheck = dependency('rapidcheck')
deps_private += rapidcheck deps_private += rapidcheck

1
src/libutil/meson.build
View file

@ -265,6 +265,7 @@ else
endif endif
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
this_library = library( this_library = library(
'nixutil', 'nixutil',

1
src/nix/meson.build
View file

@ -35,6 +35,7 @@ subdir('build-utils-meson/subprojects')
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
subdir('build-utils-meson/export-all-symbols') subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
configdata = configuration_data() configdata = configuration_data()