macos, windows meson builds

Author: HeliumAnt

.github/workflows/meson.yml

@@ -178,7 +178,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install libsdl2 onetbb lz4 libpng minizip luajit flac
+          omp install libsdl2 libsdl2_image onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

external/sources/SDL2_image-2.8.2/meson.build

@@ -0,0 +1,31 @@
+project('SDL2_image', ['c', 'cpp'])
+
+
+libname = 'SDL2_image' #filename without extension or lib prefix
+lib_include_dir = include_directories('include')
+
+if get_option('debug')
+	libname += '-Debug'
+else
+	libname += '-Release'
+endif
+
+cc = meson.get_compiler('c')
+cxx = meson.get_compiler('cpp')
+if host_machine.cpu_family() == 'x86_64'
+	libname += '-x64'
+	lib = cc.find_library(libname, dirs:  meson.current_source_dir()/'_Bin', required: false)
+	if not lib.found()
+		lib = cxx.find_library(libname, dirs:  meson.current_source_dir()/'_Bin')
+	endif
+else
+	lib = cc.find_library(libname+'-Win32', dirs:  meson.current_source_dir()/'_Bin', required: false)
+	if not lib.found()
+		lib = cxx.find_library(libname+'-Win32', dirs: meson.current_source_dir()/'_Bin')
+	endif
+endif
+
+lib_dep = declare_dependency(dependencies: lib, include_directories: lib_include_dir)
+
+meson.override_dependency(meson.project_name(), lib_dep)
+# Remember to fix the corresponding dependency in the main project meson.build (compare other precompiled libraries)

meson.build

@@ -192,6 +192,7 @@ endif
 if host_machine.system() in ['linux','darwin']
   deps += [
     dependency(['sdl2']),
+    dependency('SDL2_image'),
     dependency('flac'),
     dependency('minizip'),
     dependency('threads'),
@@ -200,15 +201,14 @@ if host_machine.system() in ['linux','darwin']
     dependency('tbb'),
     dependency('gl')
   ]
-  if host_machine.system() == 'linux'
-    deps += dependency('SDL2_image')
-  endif
   if host_machine.system()=='darwin'
     deps += dependency('appleframeworks', modules: ['Foundation'])  
   endif
 elif host_machine.system() == 'windows'
   sdl2 = subproject('SDL2-2.26.3')
   sdl2_dep = dependency('sdl2')
+  sdl2_image = subproject('SDL2_image-2.8.2')
+  sdl2_image_dep = dependency('SDL2_image')
   zlib = subproject('zlib-ng-2.1.3')
   zlib_dep = dependency('zlib')
   minizip = subproject('minizip-ng-4.0.0')
@@ -217,7 +217,7 @@ elif host_machine.system() == 'windows'
   libpng_dep = dependency('libpng')
   # Windows Libraries
   opengl = compiler.find_library('opengl32')
-  deps += [sdl2_dep, zlib_dep, minizip_dep, libpng_dep, opengl]
+  deps += [sdl2_dep, sdl2_image_dep, zlib_dep, minizip_dep, libpng_dep, opengl]
 endif