Skip to content

Commit

Permalink
Fix some compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Speak2Erase committed May 2, 2022
1 parent 8f8457a commit a69d56f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
7 changes: 5 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ if get_option('steam') == true
endif

build_static = false
if get_option('build_static') == true
build_static = true
if get_option('build_static') == true
if host_system == 'windows'
build_static = true
endif
endif


subdir('src')
subdir('binding-mri')
subdir('shader')
Expand Down
8 changes: 4 additions & 4 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ $OSTYPE == msys ]]; then
SDL2:p SDL2_image:p SDL2_ttf:p openal:p vim: freetype:p \
physfs:p pixman:p libwebp:p zlib:p meson:p clang:p \
bzip2:p libvorbis:p libogg:p zeromq:p libsigc++:p \
boost:p libpng:p libjpeg-turbo:p libtiff:p --noconfirm
boost:p libpng:p libjpeg-turbo:p libtiff:p harfbuzz:p --noconfirm

else
if [[ "$(cat /etc/issue)" == Debian* || "$(cat /etc/issue)" == Ubuntu* ]]; then
Expand All @@ -19,7 +19,7 @@ else
libphysfs-dev libpixman-1-dev libwebp-dev libbz2-dev \
libvorbis-dev libogg-dev libsodium-dev libboost-dev libpng-dev \
libjpeg-dev libtiff-dev libsigc++-2.0-dev meson vim libgtk2.0-dev \
libxfconf-0-dev libfreetype-dev
libxfconf-0-dev libfreetype-dev libharfbuzz-dev \

fi

Expand All @@ -31,7 +31,7 @@ else
libpng libjpeg libtiff zeromq mm-common base-devel vim gtk2
echo "* Installing dependencies with pamac..."
sudo pamac install sdl2_image sdl2_ttf physfs boost boost-libs \
libsigc++ sdl_sound m4 meson freetype --no-confirm
libsigc++ sdl_sound m4 meson freetype harfbuzz --no-confirm
fi

if [[ $(cat /etc/redhat-release) ]]; then
Expand All @@ -45,6 +45,6 @@ else
zeromq zeromq-devel physfs physfs-devel pixman pixman-devel \
bzip2 openal-soft speex speex-devel libmodplug libmodplug-devel \
boost boost-devel openal-soft-devel xfconf xfconf-devel gtk2 gtk2-devel \
vim meson libsigc++-devel
vim meson libsigc++-devel harfbuzz-devel
fi
fi
6 changes: 4 additions & 2 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vorbis = dependency('vorbis', static: build_static)
ogg = dependency('ogg', static: build_static)
sdl2 = dependency('SDL2')
freetype = dependency('freetype', static: build_static)
harfbuzz = dependency('harfbuzz', static: build_static)
sdl_sound = dependency('SDL2_sound', static: build_static)
sdl2_ttf = dependency('SDL2_ttf', static: build_static)
sdl2_image = dependency('SDL2_image', static: build_static)
Expand Down Expand Up @@ -51,7 +52,8 @@ global_include_dirs += include_directories('.',
'opengl/headers'
)

global_dependencies += [boost, bz2, openal, zlib, sdl2, sdl_sound, pixman, physfs, vorbisfile, vorbis, iconv, ogg, sdl2_ttf, sigcxx, sdl2_image, png, jpeg, nsgif, freetype, tiff, webp]

global_dependencies += [boost, bz2, openal, zlib, sdl2, sdl_sound, pixman, physfs, vorbisfile, vorbis, iconv, ogg, sdl2_ttf, sigcxx, sdl2_image, png, jpeg, nsgif, freetype, tiff, webp, harfbuzz]

if host_system == 'windows'
global_dependencies += compilers['cpp'].find_library('wsock32')
Expand Down Expand Up @@ -122,4 +124,4 @@ endif
if host_system == 'windows'
else
global_sources += files('xdg-user-dir-lookup.c')
endif
endif

0 comments on commit a69d56f

Please sign in to comment.