diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2018-05-02 11:18:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 11:18:24 +0300 |
| commit | 41092b4d483ac08f4982469e0b06fb41c9e0a928 (patch) | |
| tree | eb48dc2005b33a39c094896b7ca0c7f52ef8fbc6 /cura_app.py | |
| parent | 91faf884fee544c56057eb0bc40e9b3586279138 (diff) | |
| parent | fa81ebeece3c4a89d8de0c86ab0931721c172fce (diff) | |
Merge pull request #3599 from jwalt/master
Fixes for cura on ARM/Mali-based systems
Diffstat (limited to 'cura_app.py')
| -rwxr-xr-x | cura_app.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cura_app.py b/cura_app.py index 6c2d1c2937..695be52816 100755 --- a/cura_app.py +++ b/cura_app.py @@ -46,11 +46,15 @@ import faulthandler if Platform.isLinux(): # Needed for platform.linux_distribution, which is not available on Windows and OSX # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826 linux_distro_name = platform.linux_distribution()[0].lower() - # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix. - import ctypes - from ctypes.util import find_library - libGL = find_library("GL") - ctypes.CDLL(libGL, ctypes.RTLD_GLOBAL) + # The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix. + try: + import ctypes + from ctypes.util import find_library + libGL = find_library("GL") + ctypes.CDLL(libGL, ctypes.RTLD_GLOBAL) + except: + # GLES-only systems (e.g. ARM Mali) do not have libGL, ignore error + pass # When frozen, i.e. installer version, don't let PYTHONPATH mess up the search path for DLLs. if Platform.isWindows() and hasattr(sys, "frozen"): |