X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2FMakefile;h=1c3822f3392d47c5bb921d2d3330aae1a3807c86;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hp=efc7f15c1bbc6e06861b7a42b1808b1c2a7ef358;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index efc7f15c..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) )
 
@@ -16,6 +19,7 @@ OBJS = \
 	$(OBJDIR)/bcbitmap.o \
 	$(OBJDIR)/bcbutton.o \
 	$(OBJDIR)/bccapture.o \
+	$(OBJDIR)/bccolors.o \
 	$(OBJDIR)/bccmodels.o \
 	$(OBJDIR)/bccounter.o \
 	$(OBJDIR)/bcclipboard.o \
@@ -64,7 +68,6 @@ OBJS = \
 	$(OBJDIR)/bcwindowbase.o \
 	$(OBJDIR)/bcwindowdraw.o \
 	$(OBJDIR)/bcwindowevents.o \
-	$(OBJDIR)/bcxfer.o \
 	$(OBJDIR)/condition.o \
 	$(OBJDIR)/errorbox.o \
 	$(OBJDIR)/filesystem.o \
@@ -82,6 +85,7 @@ OBJS = \
 OUTPUT = $(OBJDIR)/libguicast.a
 
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
+BCXFER = xfer/$(OBJDIR)/xfer.stamp
 
 CFLAGS += -I/usr/include/freetype2
 
@@ -90,34 +94,33 @@ $(shell echo $(OBJS) > $(OBJDIR)/objs)
 
 all: $(OUTPUT) $(UTILS)
 
-$(OBJDIR)/bcxfer.o:	bcxfer.C xfer.C xfer.h
-	$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
-
-bcxfer.C:	bccmdl.py
-	python2.7 < ./bccmdl.py > bcxfer.C
+$(BCXFER):	bccmdl.py bcxfer.C bcxfer.h
+	python2.7 < ./bccmdl.py
+	+$(MAKE) -C xfer
 
-$(OUTPUT): $(OBJS)
-	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+$(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)
-	rm -f bcxfer.C
+	$(MAKE) -C xfer clean
 
 install:
 
 $(LIBOBJS) $(OBJS) $(CUTOBJ):
 
 $(OBJDIR)/%.o:          %.C
-	$(CXX) `cat $(OBJDIR)/c_flags` -c $< -o $@
+	$(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
 
 $(OBJDIR)/bootstrap: bootstrap.c
 $(OBJDIR)/pngtoh: pngtoh.c