]>
Commit | Line | Data |
---|---|---|
b7760deb | 1 | diff -dur cinelerra-2.0.orig/guicast/Makefile cinelerra-2.0/guicast/Makefile |
2 | --- cinelerra-2.0.orig/guicast/Makefile 2004-07-06 06:32:42.000000000 +0200 | |
3 | +++ cinelerra-2.0/guicast/Makefile 2004-09-13 11:14:21.672141990 +0200 | |
4f5b6db8 JK |
4 | @@ -24,6 +24,17 @@ |
5 | BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B i386 -I binary -O elf64-x86-64\"" | |
6 | endif | |
7 | ||
8 | +ifeq ($(OBJDIR), alpha) | |
556a92c5 | 9 | +BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B alpha -I binary -O elf64-alpha\"" |
4f5b6db8 JK |
10 | +endif |
11 | + | |
12 | +ifeq ($(OBJDIR), ppc) | |
556a92c5 | 13 | +BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B powerpc -I binary -O elf32-powerpc\"" |
4f5b6db8 JK |
14 | +endif |
15 | + | |
16 | +ifeq ($(OBJDIR), sparc) | |
556a92c5 | 17 | +BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B sparc -I binary -O elf32-sparc\"" |
4f5b6db8 JK |
18 | +endif |
19 | ||
20 | $(shell sh -c 'if ! test -d $(OBJDIR)\; then mkdir $(OBJDIR)\; fi' ) | |
21 | ||
ca4f2944 JB |
22 | --- cinelerra-2.1/guicast/bootstrap.c.orig 2006-03-31 07:51:03.000000000 +0200 |
23 | +++ cinelerra-2.1/guicast/bootstrap.c 2006-07-05 11:35:14.014440000 +0200 | |
24 | @@ -54,7 +54,7 @@ | |
b7760deb | 25 | |
26 | *buffer_size += strlen(string) + 1; | |
27 | ||
28 | - *(int*)(buffer + *buffer_size) = data_offset; | |
50bf3713 | 29 | + memcpy((int*)(buffer + *buffer_size), &data_offset, sizeof(int)); |
b7760deb | 30 | *buffer_size += sizeof(int); |
31 | } | |
32 | ||
ca4f2944 | 33 | @@ -195,7 +195,7 @@ |
b7760deb | 34 | |
35 | // Run system command on it | |
ca4f2944 | 36 | sprintf(system_command, "%s %s %s", BOOTSTRAP, temp_path, out_path); |
b7760deb | 37 | - system(system_command); |
38 | + return system(system_command); | |
39 | } | |
40 | ||
41 |