diff -Naur Tremolo07/Makefile Tremolo07-wince/Makefile
--- Tremolo07/Makefile	2007-08-07 19:18:34.000000000 +0200
+++ Tremolo07-wince/Makefile	2011-12-04 23:11:11.710322961 +0100
@@ -3,31 +3,30 @@
 # $URL$
 # $Id$
 
-wince_gcc_root = /usr/local/wince/cross-tools
 srcdir    = .
 VPATH     = $(srcdir)
 
-CC     = arm-wince-pe-gcc
-CXX    = arm-wince-pe-g++
-LD     = arm-wince-pe-g++
-AR     = arm-wince-pe-ar cru
-RANLIB = arm-wince-pe-ranlib
-STRIP  = arm-wince-pe-strip
-WINDRES= arm-wince-pe-windres
+CC     = arm-mingw32ce-gcc
+CXX    = arm-mingw32ce-g++
+LD     = arm-mingw32ce-g++
+AR     = arm-mingw32ce-ar cru
+RANLIB = arm-mingw32ce-ranlib
+STRIP  = arm-mingw32ce-strip
+WINDRES= arm-mingw32ce-windres
 MKDIR  = mkdir -p
 RM     = rm -f
 RM_REC = rm -rf
 ECHO   = echo -n
 CAT    = cat
-AS     = arm-wince-pe-as
+AS     = arm-mingw32ce-as
 
 DEFINES := 
 
-CFLAGS := -O2 -march=armv4 -mtune=xscale -I$(srcdir) -I$(wince_gcc_root)/include -D__cdecl= -D_WIN32_WCE=300 -D_ARM_ASSEM_ -static
+CFLAGS := -O2 -march=armv4 -mtune=xscale -I$(srcdir) -D__cdecl= -D_WIN32_WCE=300 -D_ARM_ASSEM_ -static
 
 CXXFLAGS := $(CFLAGS)
 
-LDFLAGS := -Llibs/lib -L$(wince_gcc_root)/lib
+LDFLAGS := -Llibs/lib
 LIBS := --entry WinMainCRTStartup
 
 OBJS := 
@@ -65,17 +64,23 @@
 .c.olc:
 	$(CC) $(CFLAGS) -c $(<) -o $*.olc -D_LOW_ACCURACY_ -DONLY_C
 
-all: libTremolo006.lib bittest.exe testtremor.exe testtremorC.exe testtremorL.exe testtremorLC.exe annotate.exe
-	cp libTremolo006.lib /cygdrive/c/cvs/scummvm/trunk/backends/platform/wince/libs/lib/
-	cp ivorbisfile.h /cygdrive/c/cvs/scummvm/trunk/backends/platform/wince/libs/include/tremolo006/tremor/
-	cp config_types.h /cygdrive/c/cvs/scummvm/trunk/backends/platform/wince/libs/include/tremolo006/
-	cp ivorbiscodec.h /cygdrive/c/cvs/scummvm/trunk/backends/platform/wince/libs/include/tremolo006/
-	cp ogg.h /cygdrive/c/cvs/scummvm/trunk/backends/platform/wince/libs/include/tremolo006/
-	cp os_types.h /cygdrive/c/cvs/scummvm/trunk/backends/platform/wince/libs/include/tremolo006/
-
-libTremolo006.lib: $(LIBOBJS)
-	arm-wince-pe-ar cru $@ $^
-	arm-wince-pe-ranlib $@
+all: libtremolo.a bittest.exe testtremor.exe testtremorC.exe testtremorL.exe testtremorLC.exe annotate.exe
+
+
+install: libtremolo.a bittest.exe testtremor.exe testtremorC.exe testtremorL.exe testtremorLC.exe annotate.exe
+	cp libtremolo.a /opt/mingw32ce/arm-mingw32ce/lib/
+	mkdir /opt/mingw32ce/arm-mingw32ce/include/tremolo
+	mkdir /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor
+	cp ivorbisfile.h /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor/
+	cp config_types.h /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor/
+	cp ivorbiscodec.h /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor/
+	cp ogg.h /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor/
+	cp os_types.h /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor/
+	chmod a+r /opt/mingw32ce/arm-mingw32ce/include/tremolo/tremor/*
+	
+libtremolo.a: $(LIBOBJS)
+	arm-mingw32ce-ar cru $@ $^
+	arm-mingw32ce-ranlib $@
 
 bitwiseTEST.o: bitwise.c
 	$(CC) $(CFLAGS) -c -o bitwiseTEST.o bitwise.c -D_V_BIT_TEST
diff -Naur Tremolo07/testtremor.c Tremolo07-wince/testtremor.c
--- Tremolo07/testtremor.c	2007-08-07 00:42:02.000000000 +0200
+++ Tremolo07-wince/testtremor.c	2011-12-04 23:11:11.709322990 +0100
@@ -30,7 +30,9 @@
 #define PROFILE
 
 #ifdef _WIN32 /* We need the following two to set stdin/stdout to binary */
+#ifndef __CEGCC__
 #include <io.h>
+#endif
 #include <fcntl.h>
 #endif
 
diff -Naur Tremolo07/vorbisfile.c Tremolo07-wince/vorbisfile.c
--- Tremolo07/vorbisfile.c	2007-07-05 18:35:10.000000000 +0200
+++ Tremolo07-wince/vorbisfile.c	2011-12-04 23:11:11.712322903 +0100
@@ -18,7 +18,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifndef __MINGW32CE__
 #include <errno.h>
+#endif
 #include <string.h>
 #include <math.h>
 
@@ -67,12 +69,16 @@
 
 /* read a little more data from the file/pipe into the ogg_sync framer */
 static long _get_data(OggVorbis_File *vf){
+#ifndef __MINGW32CE__
   errno=0;
+#endif
   if(vf->datasource){
     unsigned char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
     long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource);
     if(bytes>0)ogg_sync_wrote(vf->oy,bytes);
+#ifndef __MINGW32CE__
     if(bytes==0 && errno)return -1;
+#endif
     return bytes;
   }else
     return 0;
