# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1701186157 -7200
# Node ID f1b6d809e3036fb3b2464f865c6352e9e5cf7b44
# Parent  c9741a11d1cd0c60d010a7fec450d4187cba6343
Remove libpng dependency from 64vw via libgfx.o by compiling
a separate libgfx_base.o for use by 64vw etc.

diff -r c9741a11d1cd -r f1b6d809e303 Makefile.common
--- a/Makefile.common	Mon Nov 27 12:35:06 2023 +0200
+++ b/Makefile.common	Tue Nov 28 17:42:37 2023 +0200
@@ -263,7 +263,7 @@
 
 ### libPNG handling
 ifeq ($(DM_USE_LIBPNG),yes)
-DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS)
+DM_LIBPNG_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS)
 endif
 
 
@@ -359,34 +359,34 @@
 
 
 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(DMLIB)tests/%.c
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(DMLIB)tools/%.c
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: %.c %.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: %.c
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(MINIJSS)%.c
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(DMLIB_SRC)%.c $(DMLIB_SRC)%.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)%.o: $(DMLIB_SRC)%.c
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 
 ###
@@ -396,49 +396,52 @@
 	(echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
 
 $(OBJPATH)dmimage.o: $(DMLIB_SRC)dmimage.c $(DMLIB_SRC)stb_image.c $(DMLIB_SRC)dmimage.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)dmresw.o: $(DMLIB_SRC)dmresw.c $(DMLIB_SRC)dmres.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 
 $(OBJPATH)jssmod.o: $(MINIJSS)jssmod.c $(MINIJSS)jssmod.h $(OBJPATH)jss.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)jssmix.o: $(MINIJSS)jssmix.c $(MINIJSS)jssmix.h $(OBJPATH)jssmod.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)jssplr.o: $(MINIJSS)jssplr.c $(MINIJSS)jssplr.h $(OBJPATH)jssmix.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 
 $(OBJPATH)dmblit.o: $(DMLIB_SRC)dmblit.c $(DMLIB_SRC)dmscaledblit.h $(DMLIB_SRC)dmunscaledblit.h $(DMLIB_SRC)dmblitfunc.h $(DMLIB_SRC)dmlib.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)dmline.o: $(DMLIB_SRC)dmline.c $(DMLIB_SRC)dmdrawline.h $(DMLIB_SRC)dmlinefunc.h $(DMLIB_SRC)dmlineclip.h $(DMLIB_SRC)dmlib.h
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)libgfx.o: $(DMLIB)tools/libgfx.c $(DMLIB)tools/libgfx.h $(DMLIB_A)
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS) $(DM_LIBPNG_CFLAGS))
+
+$(OBJPATH)libgfx_base.o: $(DMLIB)tools/libgfx.c $(DMLIB)tools/libgfx.h $(DMLIB_A)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)lib64gfx.o: $(DMLIB)tools/lib64gfx.c $(DMLIB)tools/lib64gfx.h $(OBJPATH)libgfx.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)lib64util.o: $(DMLIB)tools/lib64util.c $(DMLIB)tools/lib64util.h $(OBJPATH)lib64gfx.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)lib64fmts.o: $(DMLIB)tools/lib64fmts.c $(OBJPATH)lib64gfx.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)64vw.o: $(DMLIB)tools/64vw.c $(OBJPATH)lib64util.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)gfxconv.o: $(DMLIB)tools/gfxconv.c $(OBJPATH)lib64util.o
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 $(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(DMLIB_SRC)setupfont.h \
 	$(OBJPATH)libgutil.o $(DMLIB_A)
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 
 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
@@ -456,7 +459,7 @@
 
 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \
 		setupmenubar.h setupfont.h setupimage.h dmsimple.c)
-	$(call COMPILE_C_OBJ,)
+	$(call COMPILE_C_OBJ,$(DM_CFLAGS))
 
 
 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.common $(DM_CONFIG)
@@ -502,12 +505,12 @@
 $(eval $(call RULE_TOOL_BIN,gfxconv,\
 	$$(OBJPATH)lib64gfx.o $$(OBJPATH)lib64fmts.o \
 	$$(OBJPATH)lib64util.o $$(OBJPATH)libgfx.o,\
-	$$(LIBPNG_LDFLAGS) $$(ZLIB_LDFLAGS)))
+	$$(DM_LIBPNG_CFLAGS) $$(LIBPNG_LDFLAGS) $$(ZLIB_LDFLAGS)))
 
 $(eval $(call RULE_TOOL_BIN,64vw,\
 	$$(OBJPATH)lib64gfx.o $$(OBJPATH)lib64fmts.o \
-	$$(OBJPATH)lib64util.o $$(OBJPATH)libgfx.o,\
-	$$(LIBPNG_LDFLAGS) $$(ZLIB_LDFLAGS) $$(SDL_LDFLAGS)))
+	$$(OBJPATH)lib64util.o $$(OBJPATH)libgfx_base.o,\
+	$$(SDL_LDFLAGS)))
 
 
 ###