diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-03-14 07:38:02 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-03-14 07:38:02 +1000 |
| commit | 6f54bde79c553301a35535a0a71a4a09b181abfa (patch) | |
| tree | 1408ad80459cd09da47960b4905d50195916639d /tools | |
| parent | 6d372f13528f44919ec193d03248d55a53484968 (diff) | |
| parent | ea5a1b849df6e5085a92957ad387f9e653674415 (diff) | |
| download | uGFX-6f54bde79c553301a35535a0a71a4a09b181abfa.tar.gz uGFX-6f54bde79c553301a35535a0a71a4a09b181abfa.tar.bz2 uGFX-6f54bde79c553301a35535a0a71a4a09b181abfa.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/file2c/binaries/linux/file2c | bin | 9700 -> 9700 bytes | |||
| -rw-r--r-- | tools/file2c/binaries/windows/file2c.exe | bin | 22030 -> 22030 bytes | |||
| -rw-r--r-- | tools/file2c/src/file2c.c | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/tools/file2c/binaries/linux/file2c b/tools/file2c/binaries/linux/file2c Binary files differindex 9d33e817..325c07fc 100755 --- a/tools/file2c/binaries/linux/file2c +++ b/tools/file2c/binaries/linux/file2c diff --git a/tools/file2c/binaries/windows/file2c.exe b/tools/file2c/binaries/windows/file2c.exe Binary files differindex 28e9a329..57f1a5dd 100644 --- a/tools/file2c/binaries/windows/file2c.exe +++ b/tools/file2c/binaries/windows/file2c.exe diff --git a/tools/file2c/src/file2c.c b/tools/file2c/src/file2c.c index f1415fe7..87ea88e9 100644 --- a/tools/file2c/src/file2c.c +++ b/tools/file2c/src/file2c.c @@ -150,7 +150,7 @@ size_t i; fprintf(f_output, "using...\n *\n *\t%s", opt_progname); if (opt_arrayname || opt_static[0] || opt_const[0] || opt_breakblocks || opt_romdir) { fprintf(f_output, " -"); - if (opt_romdir) fprintf(f_output, "b"); + if (opt_romdir) fprintf(f_output, "d"); if (opt_breakblocks) fprintf(f_output, "b"); if (opt_const[0]) fprintf(f_output, "c"); if (opt_static[0]) fprintf(f_output, "s"); |