diff --git a/apps/codecs/libfaad/codebook/hcb.h b/apps/codecs/libfaad/codebook/hcb.h index eaefdbf..8619d88 100644 --- a/apps/codecs/libfaad/codebook/hcb.h +++ b/apps/codecs/libfaad/codebook/hcb.h @@ -122,18 +122,18 @@ int hcb_2_quad_table_size[]; int hcb_2_pair_table_size[]; int hcb_bin_table_size[]; -#include "codebook/hcb_1.h" -#include "codebook/hcb_2.h" -#include "codebook/hcb_3.h" -#include "codebook/hcb_4.h" -#include "codebook/hcb_5.h" -#include "codebook/hcb_6.h" -#include "codebook/hcb_7.h" -#include "codebook/hcb_8.h" -#include "codebook/hcb_9.h" -#include "codebook/hcb_10.h" -#include "codebook/hcb_11.h" -#include "codebook/hcb_sf.h" +#include "../codebook/hcb_1.h" +#include "../codebook/hcb_2.h" +#include "../codebook/hcb_3.h" +#include "../codebook/hcb_4.h" +#include "../codebook/hcb_5.h" +#include "../codebook/hcb_6.h" +#include "../codebook/hcb_7.h" +#include "../codebook/hcb_8.h" +#include "../codebook/hcb_9.h" +#include "../codebook/hcb_10.h" +#include "../codebook/hcb_11.h" +#include "../codebook/hcb_sf.h" #ifdef __cplusplus diff --git a/tools/ovl_offset.pl b/tools/ovl_offset.pl index 89c3468..01b70de 100755 --- a/tools/ovl_offset.pl +++ b/tools/ovl_offset.pl @@ -8,7 +8,7 @@ sub map_scan { my $ramstart = -1, $ramsize = -1, $startaddr = -1, $endaddr = -1; open (MAP, "<$map"); while () { - if ($_ =~ /^PLUGIN_RAM +0x([0-9a-f]+) +0x([0-9a-f]+)$/) { + if ($_ =~ /^PLUGIN_RAM +0x([0-9a-f]+) +0x([0-9a-f]+)/) { $ramstart = hex($1); $ramsize = hex($2); } diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index 595a26a..cfc589f 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh @@ -236,7 +236,14 @@ gccurl="http://www.rockbox.org/gcc" case $arch in [Ss]) target="sh-elf" - gccpatch="gcc-4.0.3-rockbox-1.diff" + case $system in + MINGW*) + gccpatch="gcc-4.0.3-rockbox-1-mingw.diff" + ;; + *) + gccpatch="gcc-4.0.3-rockbox-1.diff" + ;; + esac ;; [Mm]) target="m68k-elf" @@ -253,13 +260,23 @@ case $arch in ;; esac ;; + MINGW*) + gccpatch="gcc-3.4.6-mingw.patch" + ;; *) ;; esac ;; [Aa]) target="arm-elf" - gccpatch="rockbox-multilibs-arm-elf-gcc-4.0.3_2.diff" + case $system in + MINGW*) + gccpatch="rockbox-multilibs-arm-elf-gcc-4.0.3_2-mingw.diff" + ;; + *) + gccpatch="rockbox-multilibs-arm-elf-gcc-4.0.3_2.diff" + ;; + esac ;; [Ii]) target="mipsel-elf" @@ -272,6 +289,9 @@ case $arch in Interix) gccpatch="gcc-4.1.2-interix.diff" ;; + MINGW*) + gccpatch="gcc-4.1.2-mingw.diff" + ;; *) ;; esac @@ -282,6 +302,13 @@ case $arch in ;; esac +# When gcc build on MinGW, "ln -s" does not use. +case $arch in + MINGW*) + export ac_cv_prog_LN_S=ln + ;; +esac + bindir="$prefix/$target/bin" if test -n $pathadd; then pathadd="$pathadd:$bindir" diff --git a/tools/root.make b/tools/root.make index 49f6a7f..1c2fcb1 100644 --- a/tools/root.make +++ b/tools/root.make @@ -93,7 +93,10 @@ tools: $(TOOLS) -include $(DEPFILE) veryclean: clean - $(SILENT)rm -rf $(TOOLS) + $(SILENT)case `uname` in \ + MINGW*) rm -rf $(TOOLS:=.exe) ;; \ + *) rm -rf $(TOOLS) ;; \ + esac clean: $(SILENT)echo Cleaning build directory