X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2FMakefile;h=1c3822f3392d47c5bb921d2d3330aae1a3807c86;hb=8bd72f90925843be9ab9182c89761ee0640e7873;hp=2d5f0d5815749baef936b89fccb3a3463d3e2f67;hpb=ecf90ad2d14e5f72505b824b7b50edd717d2d404;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile index 2d5f0d58..1c3822f3 100644 --- a/cinelerra-5.1/guicast/Makefile +++ b/cinelerra-5.1/guicast/Makefile @@ -8,6 +8,9 @@ endif ifeq ($(OBJDIR), x86_64) BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf64-x86-64\"" endif +ifeq ($(OBJDIR), amd64) +BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf64-x86-64\"" +endif $(shell mkdir -p $(OBJDIR) ) @@ -93,24 +96,24 @@ all: $(OUTPUT) $(UTILS) $(BCXFER): bccmdl.py bcxfer.C bcxfer.h python2.7 < ./bccmdl.py - +make -C xfer + +$(MAKE) -C xfer $(OUTPUT): $(OBJS) $(BCXFER) ar rc $(OUTPUT) `cat $(OBJDIR)/objs` `ls -1 $(dir $(BCXFER))/xfer*.o` ar rs $(OUTPUT) `ls -1 $(dir $(BCXFER))/xfer*.o` $(OBJDIR)/bootstrap: - gcc -O2 $(BOOTSTRAPFLAGS) bootstrap.c -o $(OBJDIR)/bootstrap + $(CC) -O2 $(BOOTSTRAPFLAGS) bootstrap.c -o $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh: pngtoh.c - gcc -O2 pngtoh.c -o $(OBJDIR)/pngtoh + $(CC) -O2 pngtoh.c -o $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw: pngtoraw.c - gcc -O2 pngtoraw.c -o $(OBJDIR)/pngtoraw -lpng -lz + $(CC) -O2 pngtoraw.c -o $(OBJDIR)/pngtoraw -lpng -lz clean: rm -rf $(OBJDIR) - make -C xfer clean + $(MAKE) -C xfer clean install: