From 55656b8ef6670d3a549d30190977efbb0f02e96b Mon Sep 17 00:00:00 2001
From: roryf <rory.fitzgerald@ntnu.no>
Date: Mon, 8 Apr 2024 13:12:08 +0200
Subject: [PATCH] Revert "meson.build for sdl2 changed to allow non-Ascii
characthers in file path"
This reverts commit 4591025e7d75acade79f743fa9151469dff0c7a0.
---
.../subprojects/sdl2_image_windows/meson.build | 7 ++-----
dependencies/subprojects/sdl2_windows/meson.build | 13 ++++---------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/dependencies/subprojects/sdl2_image_windows/meson.build b/dependencies/subprojects/sdl2_image_windows/meson.build
index 4a9555b..2019035 100644
--- a/dependencies/subprojects/sdl2_image_windows/meson.build
+++ b/dependencies/subprojects/sdl2_image_windows/meson.build
@@ -1,9 +1,6 @@
project('sdl2_image_windows', 'cpp')
-sdl2_main = declare_dependency(
- link_args : '-L' + meson.current_source_dir() + '/lib -SDL2_image')
-
+cxx = meson.get_compiler('cpp')
sdl2_image_windows_dep = declare_dependency(
- dependencies : [sdl2_main],
+ dependencies : [cxx.find_library('SDL2_image', dirs : join_paths(meson.current_source_dir(), 'lib'))],
include_directories : include_directories(join_paths('include', 'SDL2')))
-
diff --git a/dependencies/subprojects/sdl2_windows/meson.build b/dependencies/subprojects/sdl2_windows/meson.build
index 2c9e5b8..f24b477 100644
--- a/dependencies/subprojects/sdl2_windows/meson.build
+++ b/dependencies/subprojects/sdl2_windows/meson.build
@@ -1,13 +1,8 @@
project('sdl2_windows', 'cpp')
-
-sdl2_main = declare_dependency(
- link_args : '-L' + meson.current_source_dir() + '/lib -lSDL2main')
-
-sdl2 = declare_dependency(
- link_args : '-L' + meson.current_source_dir() + '/lib -lSDL2')
-
+cxx = meson.get_compiler('cpp')
sdl2_windows_dep = declare_dependency(
- dependencies : [sdl2_main, sdl2],
+ dependencies : [cxx.find_library('SDL2main', dirs : join_paths(meson.current_source_dir(), 'lib')),
+ cxx.find_library('SDL2', dirs : join_paths(meson.current_source_dir(), 'lib'))],
link_args: ['-lmingw32'],
- include_directories : include_directories(join_paths('include', 'SDL2')))
\ No newline at end of file
+ include_directories : include_directories(join_paths('include', 'SDL2')))
--
GitLab