--- a/src/MACLib/Assembly/Assembly.h 2004-05-12 06:35:56.000000000 +0200 +++ b/src/MACLib/Assembly/Assembly.h 2026-10-19 16:55:40.308285231 +0200 @@ -1,12 +1,19 @@ #ifndef APE_ASSEMBLY_H #define APE_ASSEMBLY_H +#ifdef ENABLE_ASSEMBLY extern "C" { void Adapt(short * pM, const short * pAdapt, int nDirection, int nOrder); int CalculateDotProduct(const short * pA, const short * pB, int nOrder); BOOL GetMMXAvailable(); }; +#else +// the NASM code is 32-bit x86 only, the C code paths are used without MMX +static inline void Adapt(short *, const short *, int, int) { } +static inline int CalculateDotProduct(const short *, const short *, int) { return 0; } +static inline BOOL GetMMXAvailable() { return FALSE; } +#endif #endif // #ifndef APE_ASSEMBLY_H --- a/src/MACLib/Makefile.am 2004-05-12 06:25:01.000000000 +0200 +++ b/src/MACLib/Makefile.am 2026-10-19 16:53:56.296136944 +0200 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = Assembly Old +SUBDIRS = Old lib_LTLIBRARIES = libmac.la @@ -13,7 +13,7 @@ old_ldadd = $(top_builddir)/src/MACLib/O INCLUDES = -I$(top_srcdir)/src/Shared -libmac_la_LIBADD = $(shared_ldadd) $(asm_ldadd) $(old_ldadd) +libmac_la_LIBADD = $(shared_ldadd) $(old_ldadd) libmac_la_LDFLAGS = \ -export-dynamic \ -lstdc++ \ --- a/src/MACLib/Makefile.in 2004-05-12 06:25:01.000000000 +0200 +++ b/src/MACLib/Makefile.in 2026-10-19 16:53:56.294490948 +0200 @@ -86,7 +86,7 @@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = Assembly Old +SUBDIRS = Old lib_LTLIBRARIES = libmac.la @@ -98,7 +98,7 @@ old_ldadd = $(top_builddir)/src/MACLib/O INCLUDES = -I$(top_srcdir)/src/Shared -libmac_la_LIBADD = $(shared_ldadd) $(asm_ldadd) $(old_ldadd) +libmac_la_LIBADD = $(shared_ldadd) $(old_ldadd) libmac_la_LDFLAGS = -export-dynamic -lstdc++ -version-info 2:0:0 @@ -118,7 +118,6 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libmac_la_DEPENDENCIES = $(top_builddir)/src/Shared/libmacshared.la \ -$(top_builddir)/src/MACLib/Assembly/libmacasm.la \ $(top_builddir)/src/MACLib/Old/libmacold.la libmac_la_OBJECTS = APECompress.lo APECompressCore.lo \ APECompressCreate.lo APEDecompress.lo APEHeader.lo APEInfo.lo \