Mercurial > hg > dmlib

comparison Makefile.gen @ 28:920fb22cffcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build process for jmix_c.c dependancy.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 29 Sep 2012 06:52:59 +0300
parents d427763f113a
children d1a6833a5d67
comparison
equal deleted inserted replaced
27:21c14afbf63d 28:920fb22cffcf
112 112
113 ifeq ($(JSS_SUP_THREADS),yes) 113 ifeq ($(JSS_SUP_THREADS),yes)
114 DM_CFLAGS+=-DJSS_SUP_THREADS 114 DM_CFLAGS+=-DJSS_SUP_THREADS
115 endif 115 endif
116 116
117 DMLIB_OBJS += jss.o jssmix.o jssmod.o jssplr.o
118 117
119 SUP_MODLOAD=no 118 SUP_MODLOAD=no
120 ifeq ($(JSS_SUP_XM),yes) 119 ifeq ($(JSS_SUP_XM),yes)
121 SUP_MODLOAD=yes 120 SUP_MODLOAD=yes
122 DMLIB_OBJS+= jloadxm.o 121 DMLIB_OBJS+= jloadxm.o
130 endif 129 endif
131 130
132 ifeq ($(DM_USE_C),yes) 131 ifeq ($(DM_USE_C),yes)
133 TARGETS += $(DMLIB)jmix_c.c 132 TARGETS += $(DMLIB)jmix_c.c
134 DMLIB_OBJS+=jmix_c.o 133 DMLIB_OBJS+=jmix_c.o
135
136 endif 134 endif
137 135
138 #ifeq ($(DM_USE_SIMD),yes) 136 #ifeq ($(DM_USE_SIMD),yes)
139 #DMLIB_OBJS+=jmix_simd.o 137 #DMLIB_OBJS+=jmix_simd.o
140 #endif 138 #endif
154 endif 152 endif
155 endif 153 endif
156 endif 154 endif
157 155
158 156
157 DMLIB_OBJS += jss.o jssmix.o jssmod.o jssplr.o
158
159 endif 159 endif
160 160
161 ### 161 ###
162 ### Rest of the rules 162 ### Rest of the rules
163 ### 163 ###
202 202
203 203
204 ### 204 ###
205 ### dmlib rules 205 ### dmlib rules
206 ### 206 ###
207
208 $(DMLIB)jmix_c.c: $(DMLIB)jmix_c.in.c $(DMLIB)jmix_c.h $(DMLIB)jmix_post.h
209 (echo "#include \"jssmix.h\"" && cpp $<) | sed "s/^# .*//g" > $@
210
211 207
212 $(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c 208 $(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c
213 @echo " CC $+" 209 @echo " CC $+"
214 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 210 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
215 211
229 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak 225 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak
230 @echo " AR $@ $(addprefix $(OBJPATH),$(DMLIB_OBJS))" 226 @echo " AR $@ $(addprefix $(OBJPATH),$(DMLIB_OBJS))"
231 @$(AR) cru $@ $+ $(addprefix $(OBJPATH),$(DMLIB_OBJS)) 227 @$(AR) cru $@ $+ $(addprefix $(OBJPATH),$(DMLIB_OBJS))
232 @$(RANLIB) $@ 228 @$(RANLIB) $@
233 229
230 $(DMLIB)jmix_c.c: $(DMLIB)jmix_c.in.c $(DMLIB)jmix_c.h $(DMLIB)jmix_post.h
231 (echo "#include \"jssmix.h\"" && cpp $<) | sed "s/^# .*//g" > $@
232
233
234 234
235 ### 235 ###
236 ### Tests and binaries 236 ### Tests and binaries
237 ### 237 ###
238 $(BINPATH)%$(EXEEXT): $(OBJPATH)%.o $(DMLIB_A) 238 $(BINPATH)%$(EXEEXT): $(OBJPATH)%.o $(DMLIB_A)