Mercurial > hg > dmlib
changeset 34:7908061da010
Fix building of JSS mixer parts.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 29 Sep 2012 20:31:10 +0300 |
| parents | b2fe4301384d |
| children | fb5200deeda8 |
| files | Makefile.gen jmix_post.h jssmix.c |
| diffstat | 3 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Sat Sep 29 18:51:09 2012 +0300 +++ b/Makefile.gen Sat Sep 29 20:31:10 2012 +0300 @@ -206,6 +206,9 @@ ### dmlib rules ### +$(DMLIB)jmix_c.c: $(DMLIB)jmix_c.in.c $(DMLIB)jmix_c.h $(DMLIB)jmix_post.h + (echo "#include \"jssmix.h\"" && cpp $<) | sed "s/^# .*//g" > $@ + $(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) @@ -228,9 +231,6 @@ @$(AR) cru $@ $+ $(addprefix $(OBJPATH),$(DMLIB_OBJS)) @$(RANLIB) $@ -$(DMLIB)jmix_c.c: $(DMLIB)jmix_c.in.c $(DMLIB)jmix_c.h $(DMLIB)jmix_post.h - (echo "#include \"jssmix.h\"" && cpp $<) | sed "s/^# .*//g" > $@ - ###
--- a/jmix_post.h Sat Sep 29 18:51:09 2012 +0300 +++ b/jmix_post.h Sat Sep 29 20:31:10 2012 +0300 @@ -18,9 +18,8 @@ JMIXER_FUNCTION } } +#endif #undef JMIXER_NAME #undef JMIXER_TYPE #undef JMIXER_FUNCTION - -#endif
--- a/jssmix.c Sat Sep 29 18:51:09 2012 +0300 +++ b/jssmix.c Sat Sep 29 20:31:10 2012 +0300 @@ -9,7 +9,7 @@ #ifdef DM_USE_C #define JMIXER_HEADER -#include "jmix_c.c" +#include "jmix_c.in.c" #undef JMIXER_HEADER #endif @@ -17,7 +17,7 @@ #ifdef DM_USE_SIMD #define JMIXER_HEADER -#include "jmix_mmx.h" +#include "jmix_mmx.in.c" #undef JMIXER_HEADER #endif