Browse Source

Untested attempt at linux support for harfbuzz dependency

Sasha Szpakowski 2 years ago
parent
commit
82e516f2fb

+ 4 - 1
platform/unix/configure.ac

@@ -67,7 +67,10 @@ ACLOVE_DEP_PTHREAD
 
 
 # Conditional dependencies
 # Conditional dependencies
 AS_VAR_IF([enable_module_audio], [yes], [ACLOVE_DEP_OPENAL], [])
 AS_VAR_IF([enable_module_audio], [yes], [ACLOVE_DEP_OPENAL], [])
-AS_VAR_IF([enable_module_font], [yes], [ACLOVE_DEP_FREETYPE2], [])
+AS_VAR_IF([enable_module_font], [yes], [
+	ACLOVE_DEP_FREETYPE2
+	ACLOVE_DEP_HARFBUZZ
+], [])
 AS_VAR_IF([enable_module_sound], [yes], [
 AS_VAR_IF([enable_module_sound], [yes], [
 	ACLOVE_DEP_LIBMODPLUG
 	ACLOVE_DEP_LIBMODPLUG
 	ACLOVE_DEP_VORBISFILE
 	ACLOVE_DEP_VORBISFILE

+ 2 - 1
platform/unix/debian/control.in

@@ -8,12 +8,13 @@ Build-Depends: debhelper (>= 9),
                libtool,
                libtool,
                g++ (>= 4.7.0),
                g++ (>= 4.7.0),
                libfreetype6-dev,
                libfreetype6-dev,
+               libharfbuzz-dev,
                luajit,
                luajit,
                libluajit-5.1-dev,
                libluajit-5.1-dev,
                libmodplug-dev,
                libmodplug-dev,
                libopenal-dev,
                libopenal-dev,
                libphysfs-dev,
                libphysfs-dev,
-               libsdl2-dev (>= 2.0.1),
+               libsdl2-dev (>= 2.0.9),
                libogg-dev,
                libogg-dev,
                libvorbis-dev,
                libvorbis-dev,
                libtheora-dev,
                libtheora-dev,

+ 3 - 0
platform/unix/deps.m4

@@ -1,6 +1,9 @@
 AC_DEFUN([ACLOVE_DEP_FREETYPE2], [
 AC_DEFUN([ACLOVE_DEP_FREETYPE2], [
 	PKG_CHECK_MODULES([freetype2], [freetype2], [], [LOVE_MSG_ERROR([FreeType2])])])
 	PKG_CHECK_MODULES([freetype2], [freetype2], [], [LOVE_MSG_ERROR([FreeType2])])])
 
 
+AC_DEFUN([ACLOVE_DEP_HARFBUZZ], [
+	PKG_CHECK_MODULES([harfbuzz], [harfbuzz], [], [LOVE_MSG_ERROR([Harfbuzz])])])
+
 AC_DEFUN([ACLOVE_DEP_OPENAL], [
 AC_DEFUN([ACLOVE_DEP_OPENAL], [
 	PKG_CHECK_MODULES([openal], [openal], [], [LOVE_MSG_ERROR([OpenAL])])])
 	PKG_CHECK_MODULES([openal], [openal], [], [LOVE_MSG_ERROR([OpenAL])])])
 
 

+ 2 - 2
platform/unix/genmodules

@@ -107,7 +107,7 @@ inc_libraries="$inc_current/libraries"
 
 
 cat > src/Makefile.am << EOF
 cat > src/Makefile.am << EOF
 AM_CPPFLAGS = -I$inc_current -I$inc_modules -I$inc_libraries -I$inc_libraries/enet/libenet/include -I$inc_libraries/box2d \$(LOVE_INCLUDES) \$(FILE_OFFSET)\
 AM_CPPFLAGS = -I$inc_current -I$inc_modules -I$inc_libraries -I$inc_libraries/enet/libenet/include -I$inc_libraries/box2d \$(LOVE_INCLUDES) \$(FILE_OFFSET)\
-	\$(SDL_CFLAGS) \$(lua_CFLAGS) \$(freetype2_CFLAGS)\
+	\$(SDL_CFLAGS) \$(lua_CFLAGS) \$(freetype2_CFLAGS) \$(harfbuzz_CFLAGS)\
 	\$(openal_CFLAGS) \$(zlib_CFLAGS) \$(libmodplug_CFLAGS)\
 	\$(openal_CFLAGS) \$(zlib_CFLAGS) \$(libmodplug_CFLAGS)\
 	\$(vorbisfile_CFLAGS) \$(theora_CFLAGS)
 	\$(vorbisfile_CFLAGS) \$(theora_CFLAGS)
 AUTOMAKE_OPTIONS = subdir-objects
 AUTOMAKE_OPTIONS = subdir-objects
@@ -139,7 +139,7 @@ endif
 lib_LTLIBRARIES = liblove${love_suffix}.la
 lib_LTLIBRARIES = liblove${love_suffix}.la
 liblove${love_amsuffix}_la_LDFLAGS = -module -export-dynamic \$(LDFLAGS) -release \$(PACKAGE_VERSION)
 liblove${love_amsuffix}_la_LDFLAGS = -module -export-dynamic \$(LDFLAGS) -release \$(PACKAGE_VERSION)
 liblove${love_amsuffix}_la_LIBADD = \
 liblove${love_amsuffix}_la_LIBADD = \
-	\$(SDL_LIBS) \$(freetype2_LIBS) \$(lua_LIBS)\
+	\$(SDL_LIBS) \$(freetype2_LIBS) \$(harfbuzz_LIBS) \$(lua_LIBS)\
 	\$(openal_LIBS) \$(zlib_LIBS) \$(libmodplug_LIBS)\
 	\$(openal_LIBS) \$(zlib_LIBS) \$(libmodplug_LIBS)\
 	\$(vorbisfile_LIBS) \$(theora_LIBS)
 	\$(vorbisfile_LIBS) \$(theora_LIBS)