[gtksourceview/msvc-meson-cleanups: 1/3] gtksourceview/meson.build: Clean up for MSVC
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/msvc-meson-cleanups: 1/3] gtksourceview/meson.build: Clean up for MSVC
- Date: Fri, 24 Jun 2022 03:58:23 +0000 (UTC)
commit d4da611166f98080d00ea8c82247f803aaeee049
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jun 24 11:51:01 2022 +0800
gtksourceview/meson.build: Clean up for MSVC
We already require a C99 compiler for gtksourceview-5.x (i.e. Visual Studio
2015 or later), so there is no need to include a fallback math.h instead of
the math.h that comes with Visual Studio or the Windows SDK.
We can drop the msvc subdir as a result, and clean up the build files a bit.
gtksourceview/meson.build | 13 ++---------
msvc/math.h | 58 -----------------------------------------------
2 files changed, 2 insertions(+), 69 deletions(-)
---
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index 772e923e..ca204a7f 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -169,15 +169,6 @@ if config_h.has('OS_OSX')
]
endif
-if cc.get_id() == 'msvc' and cc.version().version_compare('<18')
- # include our math.h to implement round() for pre-2013 Visual Studio
- gtksourceview_extra_include_dirs = include_directories('../msvc')
-else
- gtksourceview_extra_include_dirs = []
-endif
-
-gtksourceview_include_dirs = [rootdir, gtksourceview_extra_include_dirs]
-
core_enums_header = '''
#if defined (GTK_SOURCE_COMPILATION)
@@ -236,7 +227,7 @@ install_headers(
core_enums_h = core_enums.get(1)
core_lib = static_library(package_string + 'core', core_sources,
- include_directories: gtksourceview_include_dirs,
+ include_directories: rootdir,
dependencies: core_deps,
c_args: core_c_args + deprecated_c_args,
install: false
@@ -263,7 +254,7 @@ subdir('completion-providers')
gtksource_lib = library(package_string,
version: lib_version,
darwin_versions: lib_osx_version,
- include_directories: gtksourceview_include_dirs,
+ include_directories: rootdir,
dependencies: gtksource_deps,
link_whole: gtksource_libs,
c_args: core_c_args + deprecated_c_args,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]