diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-09-09 18:44:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 18:44:31 (GMT) |
| commit | 23ad7457ef9fa2f64f8d163a3fc845a32475f7d3 (patch) | |
| tree | fcbba5cc1f96ebd337e81c1b4150a8155303d87e | |
| parent | fa4bd654a97d3e3abb5755b005a42b16e96cb7a7 (diff) | |
| parent | dc90259bb67126a6f3e016db2a67499945d6224f (diff) | |
| download | Doxygen-23ad7457ef9fa2f64f8d163a3fc845a32475f7d3.zip Doxygen-23ad7457ef9fa2f64f8d163a3fc845a32475f7d3.tar.gz Doxygen-23ad7457ef9fa2f64f8d163a3fc845a32475f7d3.tar.bz2 | |
Merge pull request #6490 from StefanBruens/issue_6152
Order resources not only on filename but also dirname
| -rwxr-xr-x | src/res2cc_cmd.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/res2cc_cmd.py b/src/res2cc_cmd.py index 7e0322d..86d999d 100755 --- a/src/res2cc_cmd.py +++ b/src/res2cc_cmd.py @@ -98,10 +98,11 @@ def main(): directory = sys.argv[1] files = [] for dirName, subdirList, fileList in walk(directory): - for fname in sorted(fileList): + for fname in fileList: subdir = dirName[len(directory)+1:] if dirName.startswith(directory) else dirName if subdir: files.append(File.factory(directory,subdir,fname)) + files.sort(key=lambda f: f.subdir + "/" + f.fileName) outputFile = open(sys.argv[2],"w") print("#include \"resourcemgr.h\"\n",file=outputFile) for f in files: |