Skip to content

Commit

Permalink
it linked!
Browse files Browse the repository at this point in the history
  • Loading branch information
Speak2Erase committed Aug 15, 2024
1 parent 3ec1413 commit 7d3394e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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')
Expand Down

0 comments on commit 7d3394e

Please sign in to comment.