5 files changed, 18 insertions, 21 deletions

diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile
index 020d67bec8..dab4aa871e 100644
--- a/apps/plugins/rockboy/Makefile
+++ b/apps/plugins/rockboy/Makefile
@@ -7,8 +7,8 @@
 # $Id$
 #
 
-INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export       \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
 CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
  -DMEM=${MEMORYSIZE} -DPLUGIN
 
@@ -46,13 +46,13 @@ endif
 all: $(OUTPUT)
 
 ifndef SIMVER
-$(OBJDIR)/rockboy.elf: $(OBJS) $(LINKFILE) $(OUTDIR)/libplugin.a
-        @echo "LD $@"
-        @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(OUTDIR) -lplugin -lgcc \
+$(OBJDIR)/rockboy.elf: $(OBJS) $(LINKFILE)
+        @echo "LD "`basename $@`
+        @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockboy.map
 
 $(OUTPUT): $(OBJDIR)/rockboy.elf
-        @echo "OBJCOPY $<"
+        @echo "OBJCOPY "`basename $@`
         @$(OC) -O binary $< $@
 else
 
@@ -60,9 +60,9 @@ ifeq ($(SIMVER), x11)
 ###################################################
 # This is the X11 simulator version
 
-$(OUTPUT): $(OBJS) $(OUTDIR)/libplugin.a
+$(OUTPUT): $(OBJS)
         @echo "LD $@"
-        @$(CC) $(CFLAGS) -shared $(OBJS) -L$(OUTDIR) -lplugin -o $@
+        @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
 #     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
@@ -77,11 +77,11 @@ else # end of x11-simulator
 DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
-$(OUTPUT): $(OBJS) $(OUTDIR)/libplugin.a
+$(OUTPUT): $(OBJS)
         @echo "DLL $@"
         @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
         @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
-                $(OUTDIR)/libplugin.a -o $@
+                $(BUILDDIR)/libplugin.a -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
 #     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
@@ -96,10 +96,10 @@ endif # end of simulator section
 
 include $(TOOLSDIR)/make.inc
 
-# MEM should be passed on to this makefile with the chosen memory size given
-# in number of MB
+# MEMORYSIZE should be passed on to this makefile with the chosen memory size
+# given in number of MB
 $(LINKFILE): $(LDS)
-        @echo "build $@"
+        @echo "build "`basename $@`
         @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \
          -E -P - >$@
 
diff --git a/apps/plugins/rockboy/defs.h b/apps/plugins/rockboy/defs.h
index 4c520ef698..fc929635cf 100644
--- a/apps/plugins/rockboy/defs.h
+++ b/apps/plugins/rockboy/defs.h
@@ -6,7 +6,7 @@
 
 #include "rockmacros.h"
 
-#ifdef LITTLE_ENDIAN
+#ifdef ROCKBOX_LITTLE_ENDIAN
 #define LO 0
 #define HI 1
 #else
diff --git a/apps/plugins/rockboy/fastmem.c b/apps/plugins/rockboy/fastmem.c
index ffb0ed5371..d883438ce1 100644
--- a/apps/plugins/rockboy/fastmem.c
+++ b/apps/plugins/rockboy/fastmem.c
@@ -69,7 +69,7 @@ int readw(int a)
                 byte *p = mbc.rmap[a>>12];
                 if (p)
                 {
-#ifdef LITTLE_ENDIAN
+#ifdef ROCKBOX_LITTLE_ENDIAN
 #ifndef ALLOW_UNALIGNED_IO
                         if (a&1) return p[a] | (p[a+1]<<8);
 #endif
@@ -89,7 +89,7 @@ void writew(int a, int w)
                 byte *p = mbc.wmap[a>>12];
                 if (p)
                 {
-#ifdef LITTLE_ENDIAN
+#ifdef ROCKBOX_LITTLE_ENDIAN
 #ifndef ALLOW_UNALIGNED_IO
                         if (a&1)
                         {
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index a6ca0f7231..03a6810a55 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -19,10 +19,7 @@
 
 #include <plugin.h>
 
-/* workaround for cygwin not defining endian macros */
-#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) && defined(_X86_)
-#define LITTLE_ENDIAN
-#endif
+#include "autoconf.h"
 
 #define malloc(a) my_malloc(a)
 void *my_malloc(size_t size);
diff --git a/apps/plugins/rockboy/save.c b/apps/plugins/rockboy/save.c
index dc94ce69ff..f14a7191c1 100644
--- a/apps/plugins/rockboy/save.c
+++ b/apps/plugins/rockboy/save.c
@@ -15,7 +15,7 @@
 
 
 
-#ifdef LITTLE_ENDIAN
+#ifdef ROCKBOX_LITTLE_ENDIAN
 #define LIL(x) (x)
 #else
 #define LIL(x) ((x<<24)|((x&0xff00)<<8)|((x>>8)&0xff00)|(x>>24))