projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit Andrew minor Makefile addition
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
Makefile
diff --git
a/cinelerra-5.1/guicast/Makefile
b/cinelerra-5.1/guicast/Makefile
index 88369959941d54bbdbcc3d7dc14e2076a555eba4..04d5a2e58dc452c0f9b02a09b99f447bae5d0a15 100644
(file)
--- a/
cinelerra-5.1/guicast/Makefile
+++ b/
cinelerra-5.1/guicast/Makefile
@@
-5,6
+5,10
@@
ifeq ($(OBJDIR), i686)
BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf32-i386\""
endif
BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf32-i386\""
endif
+ifeq ($(OBJDIR), i386)
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf32-i386\""
+endif
+
ifeq ($(OBJDIR), x86_64)
BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf64-x86-64\""
endif
ifeq ($(OBJDIR), x86_64)
BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf64-x86-64\""
endif
@@
-16,10
+20,25
@@
ifeq ($(OBJDIR), armv8l)
BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B arm -I binary -O elf32-littlearm\""
endif
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)
ifeq ($(OBJDIR), aarch64)
-BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B arm -I binary -O elf64-littlearm\""
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B aarch64 -I binary -O elf64-littleaarch64\""
+endif
+
+ifeq ($(OBJDIR), ppc64)
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B powerpc -I binary -O elf64-powerpc\""
endif
endif
+ifeq ($(OBJDIR), ppc)
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B powerpc -I binary -O elf32-powerpc\""
+endif
+
+
+
+
$(shell mkdir -p $(OBJDIR) )
OBJS = \
$(shell mkdir -p $(OBJDIR) )
OBJS = \
@@
-102,9
+121,14
@@
$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
$(shell echo $(OBJS) > $(OBJDIR)/objs)
all: $(OUTPUT) $(UTILS)
$(shell echo $(OBJS) > $(OBJDIR)/objs)
all: $(OUTPUT) $(UTILS)
+ifeq ($(uname -s), FreeBSD)
+python = $(shell find /usrlocal/bin -name python3\* | head -n 1)
+else
+python = `which python`
+endif
$(BCXFER): bccmdl.py bcxfer.C bcxfer.h
$(BCXFER): bccmdl.py bcxfer.C bcxfer.h
-
python
< ./bccmdl.py
+
$(python)
< ./bccmdl.py
+$(MAKE) -C xfer
$(OUTPUT): $(OBJS) $(BCXFER)
+$(MAKE) -C xfer
$(OUTPUT): $(OBJS) $(BCXFER)
@@
-117,8
+141,11
@@
$(OBJDIR)/bootstrap:
$(OBJDIR)/pngtoh: pngtoh.c
$(CC) -O2 pngtoh.c -o $(OBJDIR)/pngtoh
$(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
$(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)
clean:
rm -rf $(OBJDIR)