diff options
-rwxr-xr-x | tools/addtargetdir.pl | 4 | ||||
-rwxr-xr-x | tools/configure | 10 | ||||
-rw-r--r-- | tools/functions.make | 2 | ||||
-rwxr-xr-x | tools/genlang | 6 | ||||
-rw-r--r-- | tools/root.make | 4 |
5 files changed, 21 insertions, 5 deletions
diff --git a/tools/addtargetdir.pl b/tools/addtargetdir.pl index 2cddf8d3d4..2c08d328dc 100755 --- a/tools/addtargetdir.pl +++ b/tools/addtargetdir.pl | |||
@@ -21,7 +21,7 @@ for (<STDIN>) { | |||
21 | if (/^([^:]+): (\S+) (.*)/) { | 21 | if (/^([^:]+): (\S+) (.*)/) { |
22 | my ($target, $src, $rest) = ($1, $2, $3); | 22 | my ($target, $src, $rest) = ($1, $2, $3); |
23 | my $dir = dirname $src; | 23 | my $dir = dirname $src; |
24 | $dir =~ s/$rbroot//; | 24 | $dir =~ s/^.*$rbroot//; |
25 | print "$builddir$dir/$target: $src $rest\n"; | 25 | print "$builddir$dir/$target: $src $rest\n"; |
26 | } | 26 | } |
27 | elsif (/^([^:]+): \\/) { | 27 | elsif (/^([^:]+): \\/) { |
@@ -32,7 +32,7 @@ for (<STDIN>) { | |||
32 | if (/^\s+([^ ]+) (.*)/) { | 32 | if (/^\s+([^ ]+) (.*)/) { |
33 | my ($src, $rest) = ($1, $2); | 33 | my ($src, $rest) = ($1, $2); |
34 | my $dir = dirname $src; | 34 | my $dir = dirname $src; |
35 | $dir =~ s/$rbroot//; | 35 | $dir =~ s/^.*$rbroot//; |
36 | print "$builddir$dir/$target2: $src $rest\n"; | 36 | print "$builddir$dir/$target2: $src $rest\n"; |
37 | $target2 = ""; | 37 | $target2 = ""; |
38 | } | 38 | } |
diff --git a/tools/configure b/tools/configure index 3c1975d4de..9ea5f9f739 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -133,6 +133,16 @@ simcc () { | |||
133 | output="rockboxui.exe" # use this as output binary name | 133 | output="rockboxui.exe" # use this as output binary name |
134 | ;; | 134 | ;; |
135 | 135 | ||
136 | MINGW*) | ||
137 | echo "MinGW host detected" | ||
138 | |||
139 | # sdl version | ||
140 | GCCOPTS="$GCCOPTS `sdl-config --cflags`" | ||
141 | LDOPTS="`sdl-config --libs` -mconsole" | ||
142 | |||
143 | output="rockboxui.exe" # use this as output binary name | ||
144 | ;; | ||
145 | |||
136 | Linux) | 146 | Linux) |
137 | echo "Linux host detected" | 147 | echo "Linux host detected" |
138 | if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then | 148 | if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then |
diff --git a/tools/functions.make b/tools/functions.make index 97c98a1f8d..b16bce3088 100644 --- a/tools/functions.make +++ b/tools/functions.make | |||
@@ -39,7 +39,7 @@ mkdepfile = $(shell \ | |||
39 | -e "s: pluginbitmaps/: $(BUILDDIR)/pluginbitmaps/:g" \ | 39 | -e "s: pluginbitmaps/: $(BUILDDIR)/pluginbitmaps/:g" \ |
40 | -e "s: lib/: $(APPSDIR)/plugins/lib/:g" \ | 40 | -e "s: lib/: $(APPSDIR)/plugins/lib/:g" \ |
41 | -e "s: codeclib.h: $(APPSDIR)/codecs/lib/codeclib.h:g" \ | 41 | -e "s: codeclib.h: $(APPSDIR)/codecs/lib/codeclib.h:g" \ |
42 | > $(1)_ && mv $(1)_ $(1) ) | 42 | >> $(1)_) |
43 | 43 | ||
44 | # function to create .bmp dependencies | 44 | # function to create .bmp dependencies |
45 | bmpdepfile = $(shell \ | 45 | bmpdepfile = $(shell \ |
diff --git a/tools/genlang b/tools/genlang index f4eb698a8f..21cef9966b 100755 --- a/tools/genlang +++ b/tools/genlang | |||
@@ -540,6 +540,10 @@ if($prefix) { | |||
540 | open(CFILE, ">$prefix.c") || | 540 | open(CFILE, ">$prefix.c") || |
541 | die "Error: couldn't create file $prefix.c\n"; | 541 | die "Error: couldn't create file $prefix.c\n"; |
542 | 542 | ||
543 | # get header file name | ||
544 | $headername = "$prefix.h"; | ||
545 | $headername =~ s/(.*\/)*//; | ||
546 | |||
543 | print HFILE <<MOO | 547 | print HFILE <<MOO |
544 | /* This file was automatically generated using genlang */ | 548 | /* This file was automatically generated using genlang */ |
545 | /* | 549 | /* |
@@ -564,7 +568,7 @@ MOO | |||
564 | /* This file was automaticly generated using genlang, the strings come | 568 | /* This file was automaticly generated using genlang, the strings come |
565 | from "$input" */ | 569 | from "$input" */ |
566 | 570 | ||
567 | #include "$prefix.h" | 571 | #include "$headername" |
568 | 572 | ||
569 | unsigned char *language_strings[LANG_LAST_INDEX_IN_ARRAY]; | 573 | unsigned char *language_strings[LANG_LAST_INDEX_IN_ARRAY]; |
570 | const unsigned char language_builtin[] = | 574 | const unsigned char language_builtin[] = |
diff --git a/tools/root.make b/tools/root.make index bdc2745fec..954e1bfee5 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -80,7 +80,9 @@ $(RBINFO): $(BUILDDIR)/$(BINARY) | |||
80 | $(DEPFILE) dep: | 80 | $(DEPFILE) dep: |
81 | $(call PRINTS,Generating dependencies) | 81 | $(call PRINTS,Generating dependencies) |
82 | @echo foo > /dev/null # there must be a "real" command in the rule | 82 | @echo foo > /dev/null # there must be a "real" command in the rule |
83 | $(call mkdepfile,$(DEPFILE),$(SRC) $(OTHER_SRC)) | 83 | $(call mkdepfile,$(DEPFILE),$(SRC)) |
84 | $(call mkdepfile,$(DEPFILE),$(OTHER_SRC)) | ||
85 | @mv $(DEPFILE)_ $(DEPFILE) | ||
84 | $(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP)) | 86 | $(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP)) |
85 | 87 | ||
86 | bin: $(DEPFILE) $(TOOLS) $(BUILDDIR)/$(BINARY) | 88 | bin: $(DEPFILE) $(TOOLS) $(BUILDDIR)/$(BINARY) |