starred/Mu
1
0
Fork 0
mirror of https://github.com/libretro/Mu.git synced 2026-09-23 07:05:37 +00:00
Code Issues 18 Packages Projects Releases 2 Wiki Activity

Merge pull request #80 from meepingsnesroms/tungstenT3Support

Browse Source 
Compile fix for Mac OS
This commit is contained in:
meepingsnesroms
2019-05-25 22:24:57 -07:00
committed by GitHub
parent b068d6ed53 5f1e8a53c1
commit 80026cb33e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/armv5te/bitfield.h
View File

@@ -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;
};

2
src/makefile.all
View File

@@ -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