From 4f162dc6e376970b557b05885f31367c4a7b4ee8 Mon Sep 17 00:00:00 2001 From: Dan Sumorok Date: Sat, 29 Nov 2014 19:25:31 -0500 Subject: [PATCH] Minor build fixes. --- BasiliskII/src/Unix/Makefile.in | 2 +- BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index c52eab26..d1c8bb70 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -146,7 +146,7 @@ $(GUI_APP)_app: $(GUI_APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns ./cpr.sh ../MacOSX/$(APP).icns $(GUI_APP_APP)/Contents/Resources/$(GUI_APP).icns etherhelpertool: ../MacOSX/etherhelpertool.c - $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LIBS) $< -o $@ + $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LIBS) $(LDFLAGS) $< -o $@ modules: cd Linux/NetDriver; make diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp b/BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp index f5a1aeb4..002618b4 100644 --- a/BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp +++ b/BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp @@ -726,7 +726,7 @@ PRIVATE inline int FFPU get_fp_value (uae_u32 opcode, uae_u16 extra, fpu_registe } /* Convert the FP value to integer according to the current m68k rounding mode */ -PRIVATE inline uae_s32 FFPU toint(fpu_register const & src) +PRIVATE uae_s32 FFPU toint(fpu_register const & src) { fpu_register result; switch (get_fpcr() & 0x30) {