Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-05-31 17:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from glaubitz/master

Browse Source 
Fix multiple build issues
This commit is contained in:
Laurent Vivier 2017-03-16 12:07:18 +01:00 committed by GitHub
commit 08be6d9c46
9 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -270,7 +270,7 @@ tools:: libemile libiso9660 libext2 libgzip libconfig libmap
$(MAKE) -C tools all CROSS_COMPILE=$(CROSS_COMPILE) TARGET=$(NATIVE)
tools-install:: tools
$(MAKE) -C tools install
$(MAKE) -C tools install TARGET=$(NATIVE)
tools-uninstall::
$(MAKE) -C tools uninstall

2
debian/compat vendored
View File

@ -1 +1 @@
4
9

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Wouter Verhelst <wouter@debian.org>
Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org>
Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc, e2fslibs-dev
Build-Depends: debhelper (>= 9), docbook-to-man, gcc, e2fslibs-dev
Build-Depends-Indep: gcc-4.6-m68k-linux-gnu [!m68k]
Standards-Version: 3.7.2

2
libunix/Makefile
View File

@ -4,7 +4,7 @@
TOP = $(shell pwd)
CFLAGS += -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -Os
CFLAGS += -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -ffreestanding -fpic -O2 -Os
CPPFLAGS = -I$(TOP) -I$(TOP)/../libmacos -DARCH_M68K
LIBRARY = libunix.a

1
scripts/tools.sh
View File

@ -36,7 +36,6 @@ then
if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1
then
echo "Cannot find m68k cross-compiler" 1>&2
exit 1
fi
fi
M68K_GCC_VERSION=$(${M68K_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null)

2
second/console.c
View File

@ -33,7 +33,7 @@ console_init(void)
wait_char = 0;
}
int console_putchar(int c)
extern inline int console_putchar(int c)
{
switch(selected_console)
{

2
second/console.h
View File

@ -13,7 +13,7 @@
#include "head.h"
extern void console_init(void);
extern inline int console_putchar(int c);
extern int console_putchar(int c);
extern void console_putstring(const char *s);
int wait_char;
#ifdef USE_CLI

20
tools/Makefile
View File

@ -11,7 +11,7 @@ PROGRAMS = emile-set-cmdline emile-first-tune emile-install \
iso9660_cat minigzip read_vmlinuz emile-mkisofs \
ext2_ls ext2_cat emile-mktable emile-conf
SOURCES = emile-set-cmdline.c Makefile emile-first-tune.c \
SOURCES = emile-set-cmdline.c emile-first-tune.c \
emile-install.c emile-set-output.c emile.c \
emile_scanbus.c emile-map-set.c iso9660_ls.c \
iso9660_cat.c minigzip.c read_vmlinuz.c device.c gzio.c \
@ -59,15 +59,15 @@ emile-conf: emile-conf.o device.o
install:
install -d $(DESTDIR)/$(PREFIX)/sbin/
install emile-set-cmdline $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline
install emile-first-tune $(DESTDIR)/$(PREFIX)/sbin/emile-first-tune
install emile-install $(DESTDIR)/$(PREFIX)/sbin/emile-install
install emile-set-output $(DESTDIR)/$(PREFIX)/sbin/emile-set-output
install emile $(DESTDIR)/$(PREFIX)/sbin/emile
install emile-map-set $(DESTDIR)/$(PREFIX)/sbin/emile-map-set
install emile-mkisofs $(DESTDIR)/$(PREFIX)/sbin/emile-mkisofs
install emile-mktable $(DESTDIR)/$(PREFIX)/sbin/emile-mktable
install emile-conf $(DESTDIR)/$(PREFIX)/sbin/emile-conf
install $(TARGET)/emile-set-cmdline $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline
install $(TARGET)/emile-first-tune $(DESTDIR)/$(PREFIX)/sbin/emile-first-tune
install $(TARGET)/emile-install $(DESTDIR)/$(PREFIX)/sbin/emile-install
install $(TARGET)/emile-set-output $(DESTDIR)/$(PREFIX)/sbin/emile-set-output
install $(TARGET)/emile $(DESTDIR)/$(PREFIX)/sbin/emile
install $(TARGET)/emile-map-set $(DESTDIR)/$(PREFIX)/sbin/emile-map-set
install $(TARGET)/emile-mkisofs $(DESTDIR)/$(PREFIX)/sbin/emile-mkisofs
install $(TARGET)/emile-mktable $(DESTDIR)/$(PREFIX)/sbin/emile-mktable
install $(TARGET)/emile-conf $(DESTDIR)/$(PREFIX)/sbin/emile-conf
uninstall:
rm -f $(DESTDIR)/$(PREFIX)/sbin/emile-set-cmdline