diff options
| author | Tom Gall <tom.gall@linaro.org> | 2011-12-22 15:42:51 -0600 |
|---|---|---|
| committer | Tom Gall <tom.gall@linaro.org> | 2011-12-22 15:42:51 -0600 |
| commit | 4494264f052d37efc636af4fb461e8a4f334cf28 (patch) | |
| tree | 0eb51231265d2ff4bc794fa6b85a007fe0102681 | |
| parent | 4794fdc1a58e026a4c04c4e20c02d3300f5ffe89 (diff) | |
NASM automatically adds the current directory to the include path, but YASM doesn't, so we need to explicitly add it.
| -rw-r--r-- | ChangeLog.txt | 8 | ||||
| -rw-r--r-- | simd/Makefile.am | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index d1c877a..ddd7bd5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +1.2.0 +===== + +[1] Fixed build issue with YASM on Unix systems (the libjpeg-turbo build system +was not adding the current directory to the assembler include path, so YASM +was not able to find jsimdcfg.inc.) + + 1.1.90 (1.2 beta1) ================== diff --git a/simd/Makefile.am b/simd/Makefile.am index fbba807..a12ff6e 100644 --- a/simd/Makefile.am +++ b/simd/Makefile.am @@ -61,7 +61,7 @@ endif AM_CPPFLAGS = -I$(top_srcdir) .asm.lo: - $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) $< -o $@ + $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ |