diff options
-rw-r--r-- | apps/plugins/doom/Makefile | 9 | ||||
-rw-r--r-- | apps/plugins/doom/m_swap.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index c45ffe78da..ea5644122c 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile | |||
@@ -3,7 +3,10 @@ | |||
3 | # $Id$ | 3 | # $Id$ |
4 | # | 4 | # |
5 | # $Log$ | 5 | # $Log$ |
6 | # Revision 1.1 2006/03/28 15:44:01 dave | 6 | # Revision 1.2 2006/03/29 21:16:45 kkurbjun |
7 | # Use rockbox endian defines | ||
8 | # | ||
9 | # Revision 1.1 2006-03-28 15:44:01 dave | ||
7 | # Patch #2969 - Doom! Currently only working on the H300. | 10 | # Patch #2969 - Doom! Currently only working on the H300. |
8 | # | 11 | # |
9 | # | 12 | # |
@@ -22,10 +25,6 @@ ifneq (,$(strip $(foreach tgt,IPOD_NANO IPOD_COLOR IPOD_VIDEO,$(findstring $(tgt | |||
22 | ifndef SIMVER | 25 | ifndef SIMVER |
23 | CFLAGS += -mstructure-size-boundary=8 | 26 | CFLAGS += -mstructure-size-boundary=8 |
24 | endif | 27 | endif |
25 | else | ||
26 | ifndef SIMVER | ||
27 | CFLAGS += -D__BIG_ENDIAN__ | ||
28 | endif | ||
29 | endif | 28 | endif |
30 | 29 | ||
31 | LINKFILE := $(OBJDIR)/link.lds | 30 | LINKFILE := $(OBJDIR)/link.lds |
diff --git a/apps/plugins/doom/m_swap.h b/apps/plugins/doom/m_swap.h index fdf2b92a15..026e2df1eb 100644 --- a/apps/plugins/doom/m_swap.h +++ b/apps/plugins/doom/m_swap.h | |||
@@ -37,6 +37,8 @@ | |||
37 | #pragma interface | 37 | #pragma interface |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #include "plugin.h" | ||
41 | |||
40 | /* Endianess handling. */ | 42 | /* Endianess handling. */ |
41 | 43 | ||
42 | /* cph - First the macros to do the actual byte swapping */ | 44 | /* cph - First the macros to do the actual byte swapping */ |
@@ -70,7 +72,7 @@ | |||
70 | * Use separate macros so network could be converted to big-endian later. | 72 | * Use separate macros so network could be converted to big-endian later. |
71 | */ | 73 | */ |
72 | 74 | ||
73 | #ifdef __BIG_ENDIAN__ | 75 | #ifndef ROCKBOX_LITTLE_ENDIAN |
74 | 76 | ||
75 | #define doom_wtohl(x) doom_swap_l(x) | 77 | #define doom_wtohl(x) doom_swap_l(x) |
76 | #define doom_htowl(x) doom_swap_l(x) | 78 | #define doom_htowl(x) doom_swap_l(x) |