comparison Makefile.gen @ 658:c430112449a7

Move miniJSS into a subdirectory.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Apr 2013 07:32:29 +0300
parents 064c942d342e
children bfad79dc1740
comparison
equal deleted inserted replaced
657:7e25ec0bbf59 658:c430112449a7
149 149
150 150
151 ### 151 ###
152 ### miniJSS 152 ### miniJSS
153 ### 153 ###
154 MINIJSS=$(DMLIB)/minijss/
155
156
154 ifeq ($(JSS),yes) 157 ifeq ($(JSS),yes)
155 DM_CFLAGS+=-DDM_USE_JSS 158 DM_CFLAGS+=-DDM_USE_JSS -I$(MINIJSS)
156 159
157 ifeq ($(JSS_LIGHT),yes) 160 ifeq ($(JSS_LIGHT),yes)
158 DM_CFLAGS+=-DJSS_LIGHT -Os 161 DM_CFLAGS+=-DJSS_LIGHT -Os
159 else 162 else
160 ifeq ($(JSS_USE_ASSERTS),yes) 163 ifeq ($(JSS_USE_ASSERTS),yes)
186 DMLIB_OBJS+= jloadjss.o 189 DMLIB_OBJS+= jloadjss.o
187 DM_CFLAGS+=-DJSS_SUP_JSSMOD $(JSSMOD_FLAGS) 190 DM_CFLAGS+=-DJSS_SUP_JSSMOD $(JSSMOD_FLAGS)
188 endif 191 endif
189 192
190 ifeq ($(DM_USE_C),yes) 193 ifeq ($(DM_USE_C),yes)
191 TARGETS += $(DMLIB)jmix_c.c 194 TARGETS += $(MINIJSS)jmix_c.c
192 DMLIB_OBJS+=jmix_c.o 195 DMLIB_OBJS+=jmix_c.o
193 endif 196 endif
194 197
195 #ifeq ($(DM_USE_SIMD),yes) 198 #ifeq ($(DM_USE_SIMD),yes)
196 #DMLIB_OBJS+=jmix_simd.o 199 #DMLIB_OBJS+=jmix_simd.o
274 $(OBJPATH)%.d: $(DMLIB)%.c 277 $(OBJPATH)%.d: $(DMLIB)%.c
275 @echo > $@ 278 @echo > $@
276 @grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done 279 @grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
277 280
278 281
282 $(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h
283 @echo " CC $<"
284 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
285
286 $(OBJPATH)%.o: $(MINIJSS)%.c
287 @echo " CC $<"
288 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
289
290
279 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h 291 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
280 @echo " CC $<" 292 @echo " CC $<"
281 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 293 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
282 294
283 $(OBJPATH)%.o: $(DMLIB)tests/%.c 295 $(OBJPATH)%.o: $(DMLIB)tests/%.c
314 326
315 ### 327 ###
316 ### dmlib rules 328 ### dmlib rules
317 ### 329 ###
318 330
319 $(DMLIB)jmix_c.c: $(DMLIB)jmix_c_in.c $(DMLIB)jmixtmpl_c.h $(DMLIB)jmix_post_c.h 331 $(MINIJSS)jmix_c.c: $(MINIJSS)jmix_c_in.c $(MINIJSS)jmixtmpl_c.h $(MINIJSS)jmix_post_c.h
320 (echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@ 332 (echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
321 333
322 $(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c $(DMLIB)dmimage.h 334 $(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c $(DMLIB)dmimage.h
323 @echo " CC $+" 335 @echo " CC $+"
324 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 336 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
325 337
326 338
327 $(OBJPATH)jssmod.o: $(DMLIB)jssmod.c $(DMLIB)jssmod.h $(DMLIB)jss.h 339 $(OBJPATH)jssmod.o: $(MINIJSS)jssmod.c $(MINIJSS)jssmod.h $(MINIJSS)jss.h
328 @echo " CC $+" 340 @echo " CC $+"
329 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 341 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
330 342
331 $(OBJPATH)jssplr.o: $(DMLIB)jssplr.c $(DMLIB)jssplr.h $(DMLIB)jss.h $(DMLIB)jssmod.h $(DMLIB)jssmix.h 343 $(OBJPATH)jssplr.o: $(MINIJSS)jssplr.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h
332 @echo " CC $+" 344 @echo " CC $+"
333 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 345 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
334 346
335 $(OBJPATH)jssmix.o: $(DMLIB)jssmix.c $(DMLIB)jssmix.h $(DMLIB)jss.h 347 $(OBJPATH)jssmix.o: $(MINIJSS)jssmix.c $(MINIJSS)jssmix.h $(MINIJSS)jss.h
336 @echo " CC $+" 348 @echo " CC $+"
337 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 349 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
338 350
339 $(OBJPATH)dmblit.o: $(DMLIB)dmblit.c $(DMLIB)dmscaledblit.h $(DMLIB)dmunscaledblit.h $(DMLIB)dmblitfunc.h $(DMLIB)dmlib.h 351 $(OBJPATH)dmblit.o: $(DMLIB)dmblit.c $(DMLIB)dmscaledblit.h $(DMLIB)dmunscaledblit.h $(DMLIB)dmblitfunc.h $(DMLIB)dmlib.h
340 @echo " CC $+" 352 @echo " CC $+"