|
Lines 564-569
Link Here
|
| 564 |
# Qt inc dir |
564 |
# Qt inc dir |
| 565 |
if self.qt_inc_dir is None: |
565 |
if self.qt_inc_dir is None: |
| 566 |
canidatepaths = [] |
566 |
canidatepaths = [] |
|
|
567 |
qtinc = os.getenv("QTINC") |
| 568 |
if qtinc != None: |
| 569 |
canidatepaths.append(qtinc) |
| 567 |
qtdir = os.getenv("QTDIR") |
570 |
qtdir = os.getenv("QTDIR") |
| 568 |
if qtdir != None: |
571 |
if qtdir != None: |
| 569 |
canidatepaths.append(os.path.join(qtdir,"include")) |
572 |
canidatepaths.append(os.path.join(qtdir,"include")) |
|
Lines 585-590
Link Here
|
| 585 |
# Qt lib dir |
588 |
# Qt lib dir |
| 586 |
if self.qt_lib_dir is None: |
589 |
if self.qt_lib_dir is None: |
| 587 |
canidatepaths = [] |
590 |
canidatepaths = [] |
|
|
591 |
qtlib = os.getenv("QTLIB") |
| 592 |
if qtlib != None: |
| 593 |
canidatepaths.append(qtlib) |
| 588 |
qtdir = os.getenv("QTDIR") |
594 |
qtdir = os.getenv("QTDIR") |
| 589 |
if qtdir != None: |
595 |
if qtdir != None: |
| 590 |
canidatepaths.append(os.path.join(qtdir,get_libdir_name())) |
596 |
canidatepaths.append(os.path.join(qtdir,get_libdir_name())) |
|
Lines 634-640
Link Here
|
| 634 |
|
640 |
|
| 635 |
# Find the C library (libgcc, libgcc_s or some other variation). |
641 |
# Find the C library (libgcc, libgcc_s or some other variation). |
| 636 |
if self.clib is None: |
642 |
if self.clib is None: |
| 637 |
canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ] |
643 |
canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ] |
| 638 |
self.clib = FindFileInPaths("libgcc*.so",canidatepaths) |
644 |
self.clib = FindFileInPaths("libgcc*.so",canidatepaths) |
| 639 |
if self.clib!=None: |
645 |
if self.clib!=None: |
| 640 |
self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0] |
646 |
self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0] |
|
Lines 1481-1486
Link Here
|
| 1481 |
# Qt inc dir |
1487 |
# Qt inc dir |
| 1482 |
if self.qt_inc_dir is None: |
1488 |
if self.qt_inc_dir is None: |
| 1483 |
canidatepaths = [] |
1489 |
canidatepaths = [] |
|
|
1490 |
qtinc = os.getenv("QTINC") |
| 1491 |
if qtinc != None: |
| 1492 |
canidatepaths.append(qtinc) |
| 1484 |
qtdir = os.getenv("QTDIR") |
1493 |
qtdir = os.getenv("QTDIR") |
| 1485 |
if qtdir != None: |
1494 |
if qtdir != None: |
| 1486 |
canidatepaths.append(os.path.join(qtdir,"include")) |
1495 |
canidatepaths.append(os.path.join(qtdir,"include")) |
|
Lines 1501-1506
Link Here
|
| 1501 |
# Qt lib dir |
1510 |
# Qt lib dir |
| 1502 |
if self.qt_lib_dir is None: |
1511 |
if self.qt_lib_dir is None: |
| 1503 |
canidatepaths = [] |
1512 |
canidatepaths = [] |
|
|
1513 |
qtlib = os.getenv("QTLIB") |
| 1514 |
if qtlib != None: |
| 1515 |
canidatepaths.append(qtlib) |
| 1504 |
qtdir = os.getenv("QTDIR") |
1516 |
qtdir = os.getenv("QTDIR") |
| 1505 |
if qtdir != None: |
1517 |
if qtdir != None: |
| 1506 |
canidatepaths.append(os.path.join(qtdir,get_libdir_name())) |
1518 |
canidatepaths.append(os.path.join(qtdir,get_libdir_name())) |