From 7d3394e511eecd837028c280fe0b2a51cb887c26 Mon Sep 17 00:00:00 2001 From: Melody Madeline Lyons Date: Thu, 15 Aug 2024 02:45:25 -0700 Subject: [PATCH] it linked! --- linux/Makefile | 6 ++++-- src/meson.build | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index ad5d80114..eec11dcbc 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -221,7 +221,7 @@ $(DOWNLOADS)/sdl3_image/cmakebuild/Makefile: $(DOWNLOADS)/sdl3_image/CMakeLists. -DSDL3IMAGE_PNG_SAVE=yes \ -DSDL3IMAGE_PNG_SHARED=no \ -DSDL3IMAGE_JPG_SHARED=no \ - -DSDL3IMAGE_JXL=yes \ + -DSDL3IMAGE_JXL=no \ -DSDL3IMAGE_JXL_SHARED=no \ -DSDL3IMAGE_AVIF=no \ -DSDL3IMAGE_VENDORED=yes @@ -259,10 +259,12 @@ $(LIBDIR)/libSDL3_ttf.a: $(DOWNLOADS)/sdl3_ttf/cmakebuild/Makefile $(DOWNLOADS)/sdl3_ttf/cmakebuild/Makefile: $(DOWNLOADS)/sdl3_ttf/CMakeLists.txt cd $(DOWNLOADS)/sdl3_ttf; mkdir cmakebuild; cd cmakebuild; \ - $(CMAKE) -DBUILD_SHARED_LIBS=no -DSDL3TTF_FREETYPE_VENDORED=yes + $(CMAKE) -DBUILD_SHARED_LIBS=no -DSDL3TTF_VENDORED=ON $(DOWNLOADS)/sdl3_ttf/CMakeLists.txt: $(CLONE) $(GITHUB)/libsdl-org/SDL_ttf $(DOWNLOADS)/sdl3_ttf + cd $(DOWNLOADS)/sdl3_ttf; git checkout 22347419ee08e49d77411c680f15e314ef870ab7; \ + ./external/download.sh # OpenAL openal: init_dirs libogg $(LIBDIR)/libopenal.a diff --git a/src/meson.build b/src/meson.build index 74fad4c2a..121339a8d 100755 --- a/src/meson.build +++ b/src/meson.build @@ -9,6 +9,7 @@ png = dependency('libpng', static: build_static) zlib = dependency('zlib', static: build_static) uchardet = dependency('uchardet', static: build_static) cppzmq = dependency('cppzmq', static: true) +freetype = dependency('freetype2', static: build_static) if host_system == 'windows' bz2 = dependency('bzip2', static: build_static) @@ -104,7 +105,7 @@ if disable_openal == false global_include_dirs += include_directories('audio') endif -global_dependencies += [zlib, bz2, sdl3, pixman, physfs, theora, sdl3_ttf, sdl3_image, png, iconv, uchardet, cppzmq, vorbis] +global_dependencies += [zlib, bz2, sdl3, pixman, physfs, theora, sdl3_ttf, sdl3_image, png, iconv, uchardet, cppzmq, vorbis, freetype] if host_system == 'windows' global_dependencies += compilers['cpp'].find_library('wsock32') global_dependencies += compilers['cpp'].find_library('winmm')