diff options
| author | twinaphex | 2012-12-02 18:06:01 +0100 |
|---|---|---|
| committer | twinaphex | 2012-12-02 18:06:01 +0100 |
| commit | 1cb2b455712a0c9ae814b441a5a46e24e32a808c (patch) | |
| tree | a355bc7e46c9577f358281259e32024100ac6d6a /plugins/gpu_unai | |
| parent | 01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (diff) | |
| parent | a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 (diff) | |
| download | pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.gz pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.bz2 pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/gpu_unai')
| -rw-r--r-- | plugins/gpu_unai/Makefile | 1 | ||||
| -rw-r--r-- | plugins/gpu_unai/gpu_fixedpoint.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile index cf2e5d2..994997f 100644 --- a/plugins/gpu_unai/Makefile +++ b/plugins/gpu_unai/Makefile @@ -1,5 +1,6 @@ CFLAGS += -ggdb -Wall -O3 -ffast-math CFLAGS += -DREARMED +CFLAGS += -I../../include include ../../config.mak diff --git a/plugins/gpu_unai/gpu_fixedpoint.h b/plugins/gpu_unai/gpu_fixedpoint.h index 03f07d2..e72fda1 100644 --- a/plugins/gpu_unai/gpu_fixedpoint.h +++ b/plugins/gpu_unai/gpu_fixedpoint.h @@ -21,6 +21,8 @@ #ifndef FIXED_H #define FIXED_H +#include "arm_features.h" + typedef s32 fixed; #ifdef GPU_TABLE_10_BITS @@ -55,7 +57,7 @@ INLINE u32 Log2(u32 _a) } */ -#ifdef __arm__ +#ifdef HAVE_ARMV5 INLINE u32 Log2(u32 x) { u32 res; asm("clz %0,%1" : "=r" (res) : "r" (x)); return 32-res; } #else INLINE u32 Log2(u32 x) { u32 i = 0; for ( ; x > 0; ++i, x >>= 1); return i - 1; } |