Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always use CWD as DLL search path on Windows #1628

Merged
merged 2 commits into from
Feb 25, 2024
Merged

Always use CWD as DLL search path on Windows #1628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7ad9a
cli: Use CWD as DLL search path on Windows as default.
heinezen Feb 23, 2024
6e7a043
cli: Use entrypoint path as DLL search path on Windows as default.
heinezen Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions openage/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015-2023 the openage authors. See copying.md for legal info.
# Copyright 2015-2024 the openage authors. See copying.md for legal info.
#
# pylint: disable=too-many-statements
"""
Expand Down Expand Up @@ -44,12 +44,14 @@ def close_windows_dll_path_handles(dll_path_handles):
for handle in dll_path_handles:
handle.close()

if sys.platform == 'win32' and dll_paths is not None:
import atexit
win_dll_path_handles = []
for addtional_path in dll_paths:
win_dll_path_handles.append(os.add_dll_directory(addtional_path))
atexit.register(close_windows_dll_path_handles, win_dll_path_handles)
if sys.platform != 'win32' or dll_paths is None:
return

import atexit
win_dll_path_handles = []
for addtional_path in dll_paths:
win_dll_path_handles.append(os.add_dll_directory(addtional_path))
atexit.register(close_windows_dll_path_handles, win_dll_path_handles)


def main(argv=None):
Expand All @@ -60,8 +62,11 @@ def main(argv=None):
)

if sys.platform == 'win32':
import inspect
cli.add_argument(
"--add-dll-search-path", action='append', dest='dll_paths',
# use path of current openage executable as default
default=[os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda: 0)))],
help="(Windows only) provide additional DLL search path")

cli.add_argument("--version", "-V", action='store_true', dest='print_version',
Expand Down
Loading