Mercurial > hg > dmlib
changeset 28:920fb22cffcf
Fix build process for jmix_c.c dependancy.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 29 Sep 2012 06:52:59 +0300 |
| parents | 21c14afbf63d |
| children | e9f562f07cb0 |
| files | Makefile.gen |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Sat Sep 29 06:00:26 2012 +0300 +++ b/Makefile.gen Sat Sep 29 06:52:59 2012 +0300 @@ -114,7 +114,6 @@ DM_CFLAGS+=-DJSS_SUP_THREADS endif -DMLIB_OBJS += jss.o jssmix.o jssmod.o jssplr.o SUP_MODLOAD=no ifeq ($(JSS_SUP_XM),yes) @@ -132,7 +131,6 @@ ifeq ($(DM_USE_C),yes) TARGETS += $(DMLIB)jmix_c.c DMLIB_OBJS+=jmix_c.o - endif #ifeq ($(DM_USE_SIMD),yes) @@ -156,6 +154,8 @@ endif +DMLIB_OBJS += jss.o jssmix.o jssmod.o jssplr.o + endif ### @@ -205,10 +205,6 @@ ### 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) @@ -231,6 +227,10 @@ @$(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" > $@ + + ### ### Tests and binaries