diff --git a/src/armv5te/bitfield.h b/src/armv5te/bitfield.h
index 00a7214..1f81d92 100644
--- a/src/armv5te/bitfield.h
+++ b/src/armv5te/bitfield.h
@@ -6,16 +6,22 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <type_traits>
+
+//Mac OS RetroArch port is lacking <type_traits>
+template<bool B, class T, class F>
+struct typeConditional { typedef T type; };
+
+template<class T, class F>
+struct typeConditional<false, T, F> { typedef F type; };
 
 template <size_t LastBit>
 struct MinimumTypeHelper {
     typedef
-        typename std::conditional<LastBit == 0 , void,
-        typename std::conditional<LastBit <= 8 , uint8_t,
-        typename std::conditional<LastBit <= 16, uint16_t,
-        typename std::conditional<LastBit <= 32, uint32_t,
-        typename std::conditional<LastBit <= 64, uint64_t,
+        typename typeConditional<LastBit == 0 , void,
+        typename typeConditional<LastBit <= 8 , uint8_t,
+        typename typeConditional<LastBit <= 16, uint16_t,
+        typename typeConditional<LastBit <= 32, uint32_t,
+        typename typeConditional<LastBit <= 64, uint64_t,
         void>::type>::type>::type>::type>::type type;
 };
 
diff --git a/src/makefile.all b/src/makefile.all
index 6a77417..73b3764 100644
--- a/src/makefile.all
+++ b/src/makefile.all
@@ -65,7 +65,7 @@ ifeq ($(EMU_SUPPORT_PALM_OS5), 1)
 			EMU_SOURCES_C += $(EMU_PATH)/armv5te/translate_x86_64.c \
 				$(EMU_PATH)/armv5te/asmcode.c
 			EMU_SOURCES_ASM += $(EMU_PATH)/armv5te/asmcode_x86_64.S
-		else ifeq ($(EMU_ARCH), armv7)
+		else ifneq (,$(filter armv5 armv6 armv7,$(EMU_ARCH)))
 			EMU_SOURCES_C += $(EMU_PATH)/armv5te/asmcode.c
 			EMU_SOURCES_CXX += $(EMU_PATH)/armv5te/translate_arm.cpp
 			EMU_SOURCES_ASM += $(EMU_PATH)/armv5te/asmcode_arm.S