X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2FMakefile;h=49bd154c6cb0859eff6b11205c21ffda43d4d135;hb=HEAD;hp=de3f5172d4d7511cb613e567313e8b266e9c0c23;hpb=180a8d6775163af5c008fcd933a81b78f5c768dc;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index de3f5172..49bd154c 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -20,6 +20,10 @@ ifeq ($(OBJDIR), armv8l)
 BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B arm -I binary -O elf32-littlearm\""
 endif
 
+ifeq ($(OBJDIR), armv7l)
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B arm -I binary -O elf32-littlearm\""
+endif
+
 ifeq ($(OBJDIR), aarch64)
 BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B aarch64 -I binary -O elf64-littleaarch64\""
 endif
@@ -111,15 +115,27 @@ OUTPUT = $(OBJDIR)/libguicast.a
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
 BCXFER = xfer/$(OBJDIR)/xfer.stamp
 
-CFLAGS += $(static_incs)
+CFLAGS += $(static_incs) `pkg-config --cflags libpng` `pkg-config --cflags libjpeg`
 
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(OBJS) > $(OBJDIR)/objs)
 
 all: $(OUTPUT) $(UTILS)
+PLATFORM = $(uname -s)
+ifneq ($(PLATFORM), FreeBSD)
+python = $(shell find /usr/local/bin -name python3\* | head -n 1)
+endif
+ifneq ($(PLATFORM), Linux)
+python = $(shell which python)
+endif
+
+ifeq ($(python),)
+python += $(shell which python3.9)
+endif
+
 
 $(BCXFER):	bccmdl.py bcxfer.C bcxfer.h
-	python < ./bccmdl.py
+	$(python) < ./bccmdl.py
 	+$(MAKE) -C xfer
 
 $(OUTPUT): $(OBJS) $(BCXFER)
@@ -132,8 +148,11 @@ $(OBJDIR)/bootstrap:
 $(OBJDIR)/pngtoh: pngtoh.c
 	$(CC) -O2 pngtoh.c -o $(OBJDIR)/pngtoh
 
+PNGTORAWFLAGS = $(shell pkg-config --libs libpng pkg-config --cflags libpng)
+
+
 $(OBJDIR)/pngtoraw: pngtoraw.c
-	$(CC) -O2 pngtoraw.c -o $(OBJDIR)/pngtoraw -lpng -lz
+	$(CC) -O2 pngtoraw.c -o $(OBJDIR)/pngtoraw $(PNGTORAWFLAGS) -lz
 
 clean:
 	rm -rf $(OBJDIR)