Converted png2bcd tool to python [Andrew Gardner]

.gitignore

@@ -15,3 +15,4 @@
 src/regtests/chdman/temp
 src/regtests/jedutil/output
 /sta
+*.pyc

makefile

@@ -991,9 +991,9 @@ $(OBJ)/%.lh: $(SRC)/%.lay $(SRC)/build/file2str.py
 	@echo Converting $<...
 	@$(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
 
-$(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC_TARGET) $(SRC)/build/file2str.py
+$(OBJ)/%.fh: $(SRC)/%.png $(SRC)/build/png2bdc.py $(SRC)/build/file2str.py
 	@echo Converting $<...
-	@$(PNG2BDC) $< $(OBJ)/temp.bdc
+	@$(PYTHON) $(SRC)/build/png2bdc.py $< $(OBJ)/temp.bdc
 	@$(PYTHON) $(SRC)/build/file2str.py $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
 
 $(DRIVLISTOBJ): $(DRIVLISTSRC)

src/build/build.mak

@@ -21,21 +21,18 @@ OBJDIRS += \
 MAKEDEP_TARGET = $(BUILDOUT)/makedep$(BUILD_EXE)
 MAKEMAK_TARGET = $(BUILDOUT)/makemak$(BUILD_EXE)
 MAKELIST_TARGET = $(BUILDOUT)/makelist$(BUILD_EXE)
-PNG2BDC_TARGET = $(BUILDOUT)/png2bdc$(BUILD_EXE)
 VERINFO_TARGET = $(BUILDOUT)/verinfo$(BUILD_EXE)
 
 MAKEDEP = $(MAKEDEP_TARGET)
 MAKEMAK = $(MAKEMAK_TARGET)
 MAKELIST = $(MAKELIST_TARGET)
-PNG2BDC = $(PNG2BDC_TARGET)
 VERINFO = $(VERINFO_TARGET)
 
 ifneq ($(TERM),cygwin)
 ifeq ($(OS),Windows_NT)
 MAKEDEP = $(subst /,\,$(MAKEDEP_TARGET))
 MAKEMAK = $(subst /,\,$(MAKEMAK_TARGET))
 MAKELIST = $(subst /,\,$(MAKELIST_TARGET))
-PNG2BDC = $(subst /,\,$(PNG2BDC_TARGET))
 VERINFO = $(subst /,\,$(VERINFO_TARGET))
 endif
 endif
@@ -45,7 +42,6 @@ BUILD += \
 	$(MAKEDEP_TARGET) \
 	$(MAKEMAK_TARGET) \
 	$(MAKELIST_TARGET) \
-	$(PNG2BDC_TARGET) \
 	$(VERINFO_TARGET) \
 
 
@@ -106,26 +102,6 @@ $(MAKELIST_TARGET): $(MAKELISTOBJS) $(LIBOCORE) $(ZLIB)
 
 
 
-#-------------------------------------------------
-# png2bdc
-#-------------------------------------------------
-
-PNG2BDCOBJS = \
-	$(BUILDOBJ)/png2bdc.o \
-	$(OBJ)/lib/util/astring.o \
-	$(OBJ)/lib/util/corefile.o \
-	$(OBJ)/lib/util/corealloc.o \
-	$(OBJ)/lib/util/bitmap.o \
-	$(OBJ)/lib/util/png.o \
-	$(OBJ)/lib/util/palette.o \
-	$(OBJ)/lib/util/unicode.o \
-
-$(PNG2BDC_TARGET): $(PNG2BDCOBJS) $(LIBOCORE) $(ZLIB)
-	@echo Linking $@...
-	$(LD) $(LDFLAGS) $^ $(BASELIBS) -o $@
-
-
-
 #-------------------------------------------------
 # verinfo
 #-------------------------------------------------
@@ -147,9 +123,6 @@ $(MAKEDEP_TARGET):
 $(MAKELIST_TARGET):
 	@echo $@ should be built natively. Nothing to do.
 
-$(PNG2BDC_TARGET):
-	@echo $@ should be built natively. Nothing to do.
-
 $(VERINFO_TARGET):
 	@echo $@ should be built natively. Nothing to do.