Merge pull request #39125 from Xrayez/py-modules-order-4.0

SCons: use `OrderedDict` to ensure insertion order of modules
This commit is contained in:
Rémi Verschelde 2020-05-28 20:55:56 +02:00 committed by GitHub
commit 105bef19ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -2,6 +2,7 @@ import os
import re
import glob
import subprocess
from collections import OrderedDict
def add_source_files(self, sources, files, warn_duplicates=True):
@ -138,7 +139,7 @@ def parse_cg_file(fname, uniforms, sizes, conditionals):
def detect_modules(at_path):
module_list = {} # name : path
module_list = OrderedDict() # name : path
modules_glob = os.path.join(at_path, "*")
files = glob.glob(modules_glob)