Small fixes for building on Windows

tormodvolden · May 6, 2012 · 2ef1d81 · 2ef1d81
1 parent ece1036
commit 2ef1d81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Runtime/Makefile b/Runtime/Makefile
@@ -34,6 +34,10 @@ CC      = arm-none-eabi-gcc
 CP      = arm-none-eabi-objcopy
 OD      = arm-none-eabi-objdump
 
+ifdef windir
+RM = del
+endif
+
 # Processor type
 CFLAGS += -mcpu=cortex-m3 -mthumb -mno-thumb-interwork
 
@@ -53,7 +57,7 @@ _OBJS = $(addprefix build/,$(OBJS))
 all: $(NAME).HEX
 
 clean:
-	rm -f $(NAME).HEX build/*
+	$(RM) $(NAME).HEX build/*
 
 $(NAME).HEX: build/$(NAME).elf
 	$(CP) -O ihex $< $@

diff --git a/Runtime/libfixmath/fix16.h b/Runtime/libfixmath/fix16.h
@@ -11,11 +11,10 @@ extern "C"
  */
 #ifndef FIXMATH_FUNC_ATTRS
 # ifdef __GNUC__
-#   ifdef AVR
-      // avr-gcc uselessly warns about "leaf".
-#     define FIXMATH_FUNC_ATTRS __attribute__((nothrow, pure))
-#   else
+#   if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
 #     define FIXMATH_FUNC_ATTRS __attribute__((leaf, nothrow, pure))
+#   else
+#     define FIXMATH_FUNC_ATTRS __attribute__((nothrow, pure))
 #   endif
 # else
 #   define FIXMATH_FUNC_ATTRS