From 6e2cb6b397dccbea37127bf97858c05798f5293d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 2 Dec 2021 20:56:10 +0300
Subject: [PATCH] initial attempt at adding os2 support to autotools:
invented 'LT_EXTRA' for -os2dllname libtool option
---
Makefile.am | 2 +-
configure.ac | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7dc2f27..f2abdd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,7 @@ else
libSDL2_ttf_la_LDFLAGS = \
-no-undefined \
-release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LT_EXTRA)
endif
libSDL2_ttf_la_LINK = $(LINKER) $(libSDL2_ttf_la_LDFLAGS)
libSDL2_ttf_la_LIBADD = $(TTF_LIBS) @MATHLIB@
diff --git a/configure.ac b/configure.ac
index 70f48d3..255b876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,18 +27,20 @@ AC_SUBST([MICRO_VERSION], MICRO_VERSION_MACRO)
AC_SUBST([INTERFACE_AGE], INTERFACE_AGE_MACRO)
AC_SUBST([BINARY_AGE], BINARY_AGE_MACRO)
-# libtool versioning
+dnl libtool versioning
LT_INIT([win32-dll])
LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
LT_REVISION=$INTERFACE_AGE
LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
+LT_EXTRA="" dnl for OS2 dll name
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
+AC_SUBST(LT_EXTRA)
dnl Detect the canonical build and host environments
AC_CANONICAL_HOST
@@ -66,7 +68,6 @@ case "$host" in
;;
esac
-
case "$host" in
*-*-beos*)
ac_default_prefix=/boot/develop/tools/gnupro
@@ -85,6 +86,14 @@ case "$host" in
use_version_rc=true
fi
;;
+ *-*-os2*)
+ # disable static builds on os/2
+ enable_static=no
+ # -DBUILD_SDL is needed for DECLSPEC
+ CFLAGS="$CFLAGS -DBUILD_SDL"
+ # OS/2 does not support a DLL name longer than 8 characters.
+ LT_EXTRA="-os2dllname SDL2ttf"
+ ;;
esac
AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)