From a69d56f9edf711ee9f06e38c72dd1c075f27c2ee Mon Sep 17 00:00:00 2001
From: Speak2Erase <matthew@nowaffles.com>
Date: Mon, 2 May 2022 15:25:41 -0700
Subject: [PATCH] Fix some compile errors

---
 meson.build     | 7 +++++--
 setup.sh        | 8 ++++----
 src/meson.build | 6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index e329e676..1bef5333 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/setup.sh b/setup.sh
index 1481abc0..d568c851 100755
--- a/setup.sh
+++ b/setup.sh
@@ -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
@@ -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
 
@@ -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
@@ -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
\ No newline at end of file
diff --git a/src/meson.build b/src/meson.build
index 1d30907f..5b1ce739 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -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)
@@ -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')
@@ -122,4 +124,4 @@ endif
 if host_system == 'windows'
 else
     global_sources += files('xdg-user-dir-lookup.c')
-endif
+endif
\ No newline at end of file