Skip to content

Commit bf24d63

Browse files
authored
Merge pull request #31 from Avicted/recover-work
Fix Win64 runtime DLL packaging and update .gitignore
2 parents 09d7890 + a02cb66 commit bf24d63

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ tools/__pycache__/
77
*.pyc
88
.vscode/*
99
!.vscode/tasks.json
10+
11+
TODO.md
12+

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,18 @@ package-release-win64-local:
171171
sh tools/build_win64_release.sh
172172
rm -rf "$(WIN64_RELEASE_RUNTIME_DIR)"
173173
mkdir -p "$(WIN64_RELEASE_RUNTIME_DIR)"
174+
set -- --search-dir "$(WIN64_BUILD_DIR)" --search-dir /usr/x86_64-w64-mingw32/bin; \
175+
search_dirs="$$(x86_64-w64-mingw32-gcc -print-search-dirs | sed -n 's/^libraries: =//p' | tr ':' '\n' | sed '/^$$/d' | sort -u)"; \
176+
for search_dir in $$search_dirs; do \
177+
if [ -d "$$search_dir" ]; then \
178+
set -- "$$@" --search-dir "$$search_dir"; \
179+
fi; \
180+
done; \
174181
$(PYTHON) tools/collect_mingw_runtime_dlls.py \
175182
--output-dir "$(WIN64_RELEASE_RUNTIME_DIR)" \
176183
--binary "$(WIN64_BUILD_DIR)/testrig.exe" \
177184
--binary "$(WIN64_BUILD_DIR)/visualizer.exe" \
178-
--search-dir /usr/x86_64-w64-mingw32/bin
185+
"$$@"
179186
$(PYTHON) tools/package_release.py \
180187
--platform "$(RELEASE_PLATFORM)" \
181188
--testrig "$(WIN64_BUILD_DIR)/testrig.exe" \

0 commit comments

Comments
 (0)