Skip to content

Commit 17641f1

Browse files
committed
Remove built-in libmpeg2 (only support external dependency)
1 parent dbd683d commit 17641f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+4
-24545
lines changed

Makefile.am

+1-7
Original file line numberDiff line numberDiff line change
@@ -1558,13 +1558,7 @@ endif
15581558
# softfloat/softfloatx80.h
15591559
#endif
15601560

1561-
if BUILTIN_LIBMPEG2
1562-
SUBDIRS += libmpeg2
1563-
AM_CPPFLAGS += -I$(s)/libmpeg2/include
1564-
fs_uae_LDADD += \
1565-
libmpeg2/libmpeg2/.libs/libmpeg2.a \
1566-
libmpeg2/libmpeg2/convert/.libs/libmpeg2convert.a
1567-
else
1561+
if WITH_LIBMPEG2
15681562
CM_CFLAGS += @LIBMPEG2_CFLAGS@
15691563
LIBS += @LIBMPEG2_LIBS@
15701564
endif

bootstrap

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/bin/sh
22
set -e
3-
echo "Bootstrapping libmpeg2..."
4-
cd libmpeg2
5-
./bootstrap
6-
cd ..
73
echo "Boostrapping fs-uae..."
84
# version number is cached in autom4te.cache
95
rm -Rf autom4te.cache

configure.ac

+3-8
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,12 @@ AS_IF([test "x$with_glew" = xyes], [
225225
])
226226

227227
AC_ARG_WITH(libmpeg2, AS_HELP_STRING(
228-
[--without-libmpeg2], [or --with-libmpeg2=builtin to use included version]))
229-
AM_CONDITIONAL([BUILTIN_LIBMPEG2], [test x$with_libmpeg2 = xbuiltin])
228+
[--without-libmpeg2], [Disable libmpeg2 usage]))
230229
AS_IF([test "x$with_libmpeg2" != xno], [
231-
AS_IF([test "x$with_libmpeg2" = xbuiltin], [
232-
], [
233-
PKG_CHECK_MODULES([LIBMPEG2], [libmpeg2 libmpeg2convert])
234-
])
230+
PKG_CHECK_MODULES([LIBMPEG2], [libmpeg2 libmpeg2convert])
235231
AC_DEFINE([WITH_LIBMPEG2], [1], [Define to 1 to use libmpeg2])
236232
])
233+
AM_CONDITIONAL([WITH_LIBMPEG2], [test x$with_libmpeg2 != xno])
237234

238235
AM_CONDITIONAL([BUILTIN_MANYMOUSE], [true])
239236

@@ -880,8 +877,6 @@ OPT_FEATURE([A_ZIP], [zip], [zip],
880877

881878
AC_DEFINE([FPU_UAE], [1], [Define to 1])
882879

883-
AC_CONFIG_SUBDIRS([libmpeg2])
884-
885880
# Write Makefile
886881

887882
AC_CONFIG_FILES([

libmpeg2/AUTHORS

-39
This file was deleted.

libmpeg2/COPYING

-340
This file was deleted.

libmpeg2/ChangeLog

-111
This file was deleted.

libmpeg2/CodingStyle

-76
This file was deleted.

libmpeg2/INSTALL

-58
This file was deleted.

libmpeg2/Makefile.am

-8
This file was deleted.

0 commit comments

Comments
 (0)