diff --git a/meson.build b/meson.build index 4de9551f..ee1f1dd8 100644 --- a/meson.build +++ b/meson.build @@ -474,6 +474,8 @@ if is_libretro cmake.subproject('libsndfile', options: libsndfile_options).dependency('sndfile'), cmake.subproject('pixman-region', options: pixman_region_options).dependency('pixman-region'), cmake.subproject('libpng', options: libpng_options).dependency('png_static'), + subproject('stb').get_variable('stb'), + subproject('portablegl').get_variable('portablegl'), ] if host_system == 'darwin' libretro_deps += compilers['cpp'].find_library('iconv') @@ -544,7 +546,9 @@ if is_libretro sources: global_sources + [ 'src/core.cpp', 'src/mkxp-threads.cpp', + 'src/portablegl.cpp', 'src/sharedstate.cpp', + 'src/stb_image.cpp', 'src/audio/alstream.cpp', 'src/audio/audio.cpp', 'src/audio/audiostream.cpp', diff --git a/src/portablegl.cpp b/src/portablegl.cpp new file mode 100644 index 00000000..26b4408c --- /dev/null +++ b/src/portablegl.cpp @@ -0,0 +1,2 @@ +#define PORTABLEGL_IMPLEMENTATION +#include diff --git a/src/stb_image.cpp b/src/stb_image.cpp new file mode 100644 index 00000000..91772883 --- /dev/null +++ b/src/stb_image.cpp @@ -0,0 +1,2 @@ +#define STB_IMAGE_IMPLEMENTATION +#include diff --git a/subprojects/packagefiles/portablegl/meson.build b/subprojects/packagefiles/portablegl/meson.build new file mode 100644 index 00000000..b15fd417 --- /dev/null +++ b/subprojects/packagefiles/portablegl/meson.build @@ -0,0 +1,2 @@ +project('portablegl', 'c', meson_version: '>=1.3.0') +portablegl = declare_dependency(include_directories: '.') diff --git a/subprojects/packagefiles/stb/meson.build b/subprojects/packagefiles/stb/meson.build new file mode 100644 index 00000000..23bf6e3e --- /dev/null +++ b/subprojects/packagefiles/stb/meson.build @@ -0,0 +1,2 @@ +project('stb', 'c', meson_version: '>=1.3.0') +stb = declare_dependency(include_directories: '.') diff --git a/subprojects/portablegl.wrap b/subprojects/portablegl.wrap new file mode 100644 index 00000000..e5bc1db4 --- /dev/null +++ b/subprojects/portablegl.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://github.com/rswinkle/PortableGL +revision = 0.98.0 +depth = 1 +patch_directory = portablegl diff --git a/subprojects/stb.wrap b/subprojects/stb.wrap new file mode 100644 index 00000000..66c5e711 --- /dev/null +++ b/subprojects/stb.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://github.com/nothings/stb +revision = 5c205738c191bcb0abc65c4febfa9bd25ff35234 +depth = 1 +patch_directory = stb