Asm filters

[mnk]

I'm not sure whether it's a problem with nasm (2.05.01)

or cmake (2.6.2), but recent svn does not build with

USE_ASM_SCALERS.

The error is:

src/filters/hq/asm/hq3x_16.asm:21: fatal: unable to open include file `macros.mac'

The actual command is:

/usr/bin/nasm -f elf -Isrc/hq/asm/ -O1 -DELF -w-orphan-labels -I/usr/include/SDL -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/giomm-2.4 -I/usr/lib/giomm-2.4/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -I/usr/include/gtkglextmm-1.2 -I/usr/lib/gtkglextmm-1.2/include -I/usr/include/gtkglext-1.0 -I/usr/lib/gtkglext-1.0/include -I/usr/include/libglademm-2.4 -I/usr/lib/libglademm-2.4/include -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -DSYSCONFDIR='"/etc"' -DWITH_LIRC='0' -DVERSION='"1.8.0-SVN"' -DPKGDATADIR='"/usr/local/share/vbam"' -DPACKAGE='"vbam"' -o CMakeFiles/vbam.dir/src/filters/hq/asm/hq3x_16.o /root/work/lcomp/vba-m/trunk/src/filters/hq/asm/hq3x_16.asm

 

If I add '-Isrc/filters/hq/asm/' this file builds, but other include macro.mac too.

[bgK]

Il looks like I didn't do enough of testing while moving files around. Fixed now. The include path was still pointing to the old location of macro.mac. Thanks for the report.

[mnk]

OK, one more thing: when you were fixing fex_mini.cpp, you broke it.

 

res!=1 is the problem - res is initialized as 0, if fread is not done (that is,

if it's not a gzip file), res stays at 0, so error is incorrectly triggered.

[bgK]

Right, thanks again !