Browse Source
Merge pull request #1979 from linusyang92/mingw-plugin
Update libcork and Docker script for MinGW
pull/1985/head
Max Lv
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
3 deletions
-
docker/mingw/Dockerfile
-
docker/mingw/build.sh
-
libcork
|
|
|
@ -38,5 +38,6 @@ RUN /bin/bash -c "source /deps.sh && dk_deps" |
|
|
|
ADD build.sh / |
|
|
|
|
|
|
|
ARG REBUILD=0 |
|
|
|
ARG PLUGIN=true |
|
|
|
|
|
|
|
RUN /bin/bash -c "source /build.sh && dk_build && dk_package" |
|
|
|
@ -85,8 +85,8 @@ dk_package() { |
|
|
|
cp ${DIST}/x86_64/bin/ss-${bin}.exe ss-${bin}-x64.exe |
|
|
|
done |
|
|
|
for bin in local server; do |
|
|
|
cp ${DIST}/i686/bin/obfs-${bin}.exe obfs-${bin}-x86.exe |
|
|
|
cp ${DIST}/x86_64/bin/obfs-${bin}.exe obfs-${bin}-x64.exe |
|
|
|
cp ${DIST}/i686/bin/obfs-${bin}.exe obfs-${bin}-x86.exe || true |
|
|
|
cp ${DIST}/x86_64/bin/obfs-${bin}.exe obfs-${bin}-x64.exe || true |
|
|
|
done |
|
|
|
pushd "$SRC/proj" |
|
|
|
GIT_REV="$(git rev-parse --short HEAD)" |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit d447acd7d1c3615759db01287205434fec90a2b4 |
|
|
|
Subproject commit c9b3ea9638b3adcbc07ee229fd630f439cdecae8 |
