This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch rggammon/master
in repository efl.
View the commit online.
commit a322fba66d9cb58c5a3b783150ffd5e82d1d5a81
Author: Ryan Gammon <r...@gamnation.net>
AuthorDate: Thu Aug 3 21:25:42 2023 -0700
windows build fixes
---
src/bindings/mono/efl_mono/meson.build | 6 +++++-
src/bindings/mono/efl_sharp.csproj.in | 1 +
src/bindings/mono/meson.build | 31 +++++++++++++++++++++++++++++--
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/bindings/mono/efl_mono/meson.build b/src/bindings/mono/efl_mono/meson.build
index 5ca6f116d6..a06c94e0d1 100644
--- a/src/bindings/mono/efl_mono/meson.build
+++ b/src/bindings/mono/efl_mono/meson.build
@@ -24,7 +24,11 @@ endif
foreach mono_libs : mono_sublibs
key = mono_libs[0].to_upper()+'_DL_MONO'
- efl_libs.set(key, mono_libs[0].to_lower())
+ if target_machine.system() == 'windows'
+ efl_libs.set(key, 'lib' + mono_libs[0].to_lower() + '-1')
+ else
+ efl_libs.set(key, mono_libs[0].to_lower())
+ endif
endforeach
configure_file(
diff --git a/src/bindings/mono/efl_sharp.csproj.in b/src/bindings/mono/efl_sharp.csproj.in
index 94e092e16a..640207db71 100644
--- a/src/bindings/mono/efl_sharp.csproj.in
+++ b/src/bindings/mono/efl_sharp.csproj.in
@@ -17,6 +17,7 @@
<!-- </PropertyGroup> -->
<PropertyGroup>
<DefineConstants>@EFL_BETA@</DefineConstants>
+ <DefineConstants>@EFL_WIN32@</DefineConstants>
</PropertyGroup>
<ItemGroup>
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index 74f2d06de7..c462cb4c8c 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -81,6 +81,11 @@ foreach lib : mono_sublibs
package_name = lib[0].to_lower()
eo_file_subdirs = get_variable(package_name + '_eo_subdirs')
file_location = join_paths('..', '..', 'lib', package_name)
+ dllimport = package_name
+
+ if target_machine.system() == 'windows'
+ dllimport = 'lib' + dllimport + '-1'
+ endif
if (package_name != 'eldbus')
foreach eo_file_subdir : eo_file_subdirs
@@ -101,7 +106,7 @@ foreach lib : mono_sublibs
input : join_paths(subdir_file_location, mono_gen_file),
output : [mono_gen_file + '.cs'],
command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
- '--dllimport', package_name,
+ '--dllimport', dllimport,
'-o', join_paths(meson.current_build_dir(), mono_gen_file + '.cs'),
'-e', get_option('mono-examples-dir'), partial,
'@INPUT@'])
@@ -211,7 +216,22 @@ if (get_option('dotnet'))
# The major version should be enough for now while we don't have to deal
# with minor differences and dotnet core is far from version 10
dotnet_major_version = dotnet_version.stdout().strip()[0].to_int()
- if dotnet_major_version == 3
+ if dotnet_major_version == 8
+ dotnet_core_app_version = '8.0'
+ dotnet_standard_version = '2.1'
+ elif dotnet_major_version == 7
+ dotnet_core_app_version = '7.0'
+ dotnet_standard_version = '2.1'
+ elif dotnet_major_version == 6
+ dotnet_core_app_version = '6.0'
+ dotnet_standard_version = '2.1'
+ elif dotnet_major_version == 5
+ dotnet_core_app_version = '5.0'
+ dotnet_standard_version = '2.1'
+ elif dotnet_major_version == 4
+ dotnet_core_app_version = '4.0'
+ dotnet_standard_version = '2.1'
+ elif dotnet_major_version == 3
dotnet_core_app_version = '3.0'
dotnet_standard_version = '2.1'
elif dotnet_major_version == 2
@@ -232,6 +252,13 @@ if (get_option('dotnet'))
lib_csproj_conf_data.set('EFL_BETA', '')
endif
+ if target_machine.system() == 'windows'
+ lib_csproj_conf_data.set('EFL_WIN32', 'WIN32')
+ else
+ lib_csproj_conf_data.set('EFL_WIN32', '')
+ endif
+
+
lib_csproj = configure_file(input: 'efl_sharp.csproj.in',
output: 'efl_sharp.csproj',
configuration: lib_csproj_conf_data)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
