diff --git a/client/devkit_client/gui2/SDL2.dll b/client/devkit_client/gui2/SDL2.dll deleted file mode 100644 index 878760628d4855ee65934869a1f47050b6920678..0000000000000000000000000000000000000000 Binary files a/client/devkit_client/gui2/SDL2.dll and /dev/null differ diff --git a/client/devkit_client/gui2/__init__.py b/client/devkit_client/gui2/__init__.py index 8ba283513290bc6a0044b569ffe27b11186d32a1..bc837a8ad3351d5d3d627dc6095719d0b0591be7 100644 --- a/client/devkit_client/gui2/__init__.py +++ b/client/devkit_client/gui2/__init__.py @@ -4,24 +4,5 @@ import sys import os import platform -def setup_pysdl2_dll_path(): - if platform.system() != 'Windows': - return - if 'PYSDL2_DLL_PATH' in os.environ: - return - if getattr(sys, 'frozen', False): - # Running frozen - dir_ = os.path.dirname(sys.executable) - os.environ['PYSDL2_DLL_PATH'] = os.path.join(dir_, 'lib', 'devkit_client', 'gui2') - else: - # Running from script - dir_ = os.path.dirname(__file__) - os.environ['PYSDL2_DLL_PATH'] = dir_ - print('Setting PYSDL2_DLL_PATH: {!r}'.format(os.environ['PYSDL2_DLL_PATH'])) - if sys.stdout: - sys.stdout.flush() - -setup_pysdl2_dll_path() - from .gui2 import main diff --git a/requirements.txt b/requirements.txt index 1ba50b796f1226eafe109f264dd2f6106d1d22b9..f28dd46071d44b9a33a822f0b45ab26b57ce11ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ PySDL2 +pysdl2-dll PyOpenGL signalslot >= 0.2.0 ifaddr diff --git a/setup/cxfreeze-windows.py b/setup/cxfreeze-windows.py index 5677381a357671aed0271d6d8fb4189ec13ab546..7ca58e46c743acb31b4de2ae629c3d522568b13e 100644 --- a/setup/cxfreeze-windows.py +++ b/setup/cxfreeze-windows.py @@ -34,6 +34,7 @@ assert sys.platform == 'win32' module_map = { 'PySDL2': 'sdl2', + 'pysdl2-dll': 'sdl2dll', 'PyOpenGL': 'OpenGL', 'PyNaCl': 'nacl', 'imgui[sdl2]': 'imgui',