Skip to content

Commit 0c7ed4f

Browse files
committed
Fix Windows builds for CPython, OpenCV, PyTorch, SentencePiece
1 parent 25e962a commit 0c7ed4f

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

cpython/cppbuild.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ case $PLATFORM in
173173
windows-x86)
174174
mkdir -p ../include ../lib ../libs ../bin
175175
cd PCbuild
176-
cmd.exe //c 'build.bat -p x86 -vv'
176+
PLATFORM= cmd.exe //c 'build.bat -p x86 -vv'
177177
cp win32/python*.exe win32/python*.dll ../../bin/
178178
cp win32/python*.lib ../../libs/
179179
cp win32/*.dll win32/*.pyd ../../lib/
@@ -186,7 +186,7 @@ case $PLATFORM in
186186
windows-x86_64)
187187
mkdir -p ../include ../lib ../libs ../bin
188188
cd PCbuild
189-
cmd.exe //c 'build.bat -p x64 -vv'
189+
PLATFORM= cmd.exe //c 'build.bat -p x64 -vv'
190190
cp amd64/python*.exe amd64/python*.dll ../../bin/
191191
cp amd64/python*.lib ../../libs/
192192
cp amd64/*.dll amd64/*.pyd ../../lib/

opencv/cppbuild.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,12 @@ case $PLATFORM in
419419
fi
420420
ninja -j $MAKEJ
421421
ninja install
422-
cp -r ../x86/vc16/lib ..
423-
cp -r ../x86/vc16/bin ..
422+
cp -r ../x86/vc??/lib ..
423+
cp -r ../x86/vc??/bin ..
424424
cp lib/opencv_java.lib ../lib
425425
cp lib/opencv_java.dll ../bin
426-
sedinplace "s:/x86/vc16/lib/:/lib/:g" ../x86/vc16/lib/OpenCVModules-release.cmake
427-
sedinplace "s:/x86/vc16/bin/:/:g" ../x86/vc16/lib/OpenCVModules-release.cmake
426+
sedinplace "s:/x86/vc../lib/:/lib/:g" ../x86/vc??/lib/OpenCVModules-release.cmake
427+
sedinplace "s:/x86/vc../bin/:/:g" ../x86/vc??/lib/OpenCVModules-release.cmake
428428
;;
429429
windows-x86_64)
430430
export CC="cl.exe"
@@ -439,12 +439,12 @@ case $PLATFORM in
439439
[[ ! -f modules/cudev/opencv_cudev_main.cpp ]] || sedinplace '/__termination/d' modules/cudev/opencv_cudev_main.cpp
440440
ninja -j $MAKEJ
441441
ninja install
442-
cp -r ../x64/vc16/lib ..
443-
cp -r ../x64/vc16/bin ..
442+
cp -r ../x64/vc??/lib ..
443+
cp -r ../x64/vc??/bin ..
444444
cp lib/opencv_java.lib ../lib
445445
cp lib/opencv_java.dll ../bin
446-
sedinplace "s:/x64/vc16/lib/:/lib/:g" ../x64/vc16/lib/OpenCVModules-release.cmake
447-
sedinplace "s:/x64/vc16/bin/:/:g" ../x64/vc16/lib/OpenCVModules-release.cmake
446+
sedinplace "s:/x64/vc../lib/:/lib/:g" ../x64/vc??/lib/OpenCVModules-release.cmake
447+
sedinplace "s:/x64/vc../bin/:/:g" ../x64/vc??/lib/OpenCVModules-release.cmake
448448
;;
449449
*)
450450
echo "Error: Platform \"$PLATFORM\" is not supported"

pytorch/cppbuild.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ if [[ $PLATFORM == windows* ]]; then
5858
tar xfz libuv.tgz
5959
mkdir build
6060
cd build
61-
cmake ../libuv-v1.39.0 -DBUILD_TESTING=OFF
61+
export CC="cl.exe"
62+
export CXX="cl.exe"
63+
cmake -G "Ninja" ../libuv-v1.39.0 -DBUILD_TESTING=OFF
6264
cmake --build . --config Release
6365
cmake --install . --config Release --prefix ../dist
6466
cd ../..

sentencepiece/cppbuild.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ case $PLATFORM in
3232
macosx-arm64)
3333
$CMAKE $CMAKE_CONFIG -DCMAKE_OSX_ARCHITECTURES="arm64" ..
3434
;;
35+
windows-*)
36+
export CC="cl.exe"
37+
export CXX="cl.exe"
38+
$CMAKE $CMAKE_CONFIG -G "Ninja" ..
39+
;;
3540
*)
3641
$CMAKE $CMAKE_CONFIG ..
3742
;;

0 commit comments

Comments
 (0)