forked from Miroirs/x49gp
Fixed Makefiles to support Ubuntu 12.04
This commit is contained in:
parent
816a29d8be
commit
3b517a294c
2 changed files with 5 additions and 5 deletions
4
Makefile
4
Makefile
|
@ -169,10 +169,10 @@ endif
|
||||||
|
|
||||||
ifdef QEMU_OLD
|
ifdef QEMU_OLD
|
||||||
$(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU)/arm-softmmu/libqemu.a
|
$(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU)/arm-softmmu/libqemu.a
|
||||||
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
|
$(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
|
||||||
else
|
else
|
||||||
$(TARGET): $(OBJS) $(VVFATOBJS) $(X49GP_LIBS)
|
$(TARGET): $(OBJS) $(VVFATOBJS) $(X49GP_LIBS)
|
||||||
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
|
$(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
flash-49g+: $(BOOT49GP) flash-noboot
|
flash-49g+: $(BOOT49GP) flash-noboot
|
||||||
|
|
|
@ -777,9 +777,9 @@ if test -z "$zero_malloc" ; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$werror" = "yes" ; then
|
#if test "$werror" = "yes" ; then
|
||||||
QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
|
# QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
|
||||||
fi
|
#fi
|
||||||
|
|
||||||
if test "$solaris" = "no" ; then
|
if test "$solaris" = "no" ; then
|
||||||
if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then
|
if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then
|
||||||
|
|
Loading…
Reference in a new issue