Skip to content

Include dependent dlls in output folder #342

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

Open
Artoria2e5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Include dependent dlls in output folder #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ jobs:
- name: Script
run: | # Cannot use `make exe`, as the OpenCL ICD Loader does not support static linking
make prpll -O -j $env:NUMBER_OF_PROCESSORS
make deplib
cd build-release
rm *.o
.\prpll.exe -h
Expand Down
11 changes: 10 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The build artifacts are put in the "build-release" subfolder (or "build-debug" for a debug build).

# On Windows invoke with "make exe" or "make all"
# On Windows invoke "make deplib" after building to copy dependent DLLs to the binary folder.

# Uncomment below as desired to set a particular compiler or force a debug build:
# CXX = g++-12
Expand Down Expand Up @@ -82,6 +82,15 @@ $(BIN)/%.o : src/%.cpp $(DEPDIR)/%.d
$(COMPILE.cc) $(OUTPUT_OPTION) $<
$(POSTCOMPILE)

ifeq ($(shell case $(HOST_OS) in (*_NT*) echo 1;; esac),1)
# Copy dependent DLLs to the binary folder on Windows
# At present this should only be libwinpthread
deplib: $(BIN)/prpll
ldd $(BIN)/prpll.exe | grep "=> /.[^/]" | awk '{print $$3}' | xargs -- cp -t $(BIN)
else
# Mostly pointless on Linux. Has a point on Darwin but not implemented yet.
deplib:
endif

# src/bundle.cpp is just a wrapping of the OpenCL sources (*.cl) as a C string.

Expand Down