Skip to content

Commit

Permalink
Update Windows build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@philip-lamb
philip-lamb committed Apr 11, 2024
1 parent d0c98a1 commit 3f6aa72
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 25 deletions.
49 changes: 26 additions & 23 deletions build_ss2.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
SETLOCAL EnableDelayedExpansion

SET CONFIG=release
SET VS_VERSION=2019
SET VS_VERSION=2022
REM Common editions include Community and Enterprise
SET VS_EDITION=Community
SET SERVO_UNITY_PATH=..\servo-unity
SET COPY_TO_SERVOUNITY=YES
SET PYTHON=C:\Python37\python.exe
SET PYTHON=C:\python\python.exe

GOTO :loop
:usage
Expand Down Expand Up @@ -53,9 +53,13 @@ IF "%CONFIG%"=="release" (

IF NOT "%TARGET%"=="arm64" (
IF "%VSCMD_VER%" EQU "" (
CALL "%programfiles(x86)%\Microsoft Visual Studio\%VS_VERSION%\%VS_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" x64
IF "%VS_VERSION%" LEQ "2019" (
CALL "%programfiles(x86)%\Microsoft Visual Studio\%VS_VERSION%\%VS_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" x64
) ELSE (
CALL "%programfiles%\Microsoft Visual Studio\%VS_VERSION%\%VS_EDITION%\VC\Auxiliary\Build\vcvarsall.bat" x64
)
)
%PYTHON% mach build %MACH_CONFIG% --libsimpleservo2
%PYTHON% mach build %MACH_CONFIG% --libsimpleservo2 --without-wgl
IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%

SET BUILD_DIR=target\%CONFIG%
Expand Down Expand Up @@ -89,14 +93,14 @@ IF "%COPY_TO_SERVOUNITY%"=="YES" (
)

rem Dependencies: SSL
xcopy /f /y "!BUILD_DIR!\libcrypto.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libssl.dll" "!SERVO_UNITY_BINDIR!"
rem xcopy /f /y "!BUILD_DIR!\libcrypto.dll" "!SERVO_UNITY_BINDIR!"
rem xcopy /f /y "!BUILD_DIR!\libssl.dll" "!SERVO_UNITY_BINDIR!"

rem Dependencies: Gstreamer core
xcopy /f /y "!BUILD_DIR!\avcodec-58.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avfilter-7.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avformat-58.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avutil-56.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avcodec-59.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avfilter-8.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avformat-59.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\avutil-57.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\bz2.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\ffi-7.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gio-2.0-0.dll" "!SERVO_UNITY_BINDIR!"
Expand All @@ -105,29 +109,24 @@ IF "%COPY_TO_SERVOUNITY%"=="YES" (
xcopy /f /y "!BUILD_DIR!\gobject-2.0-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\intl-8.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\orc-0.4-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\swresample-3.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\swresample-4.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\z-1.dll" "!SERVO_UNITY_BINDIR!"
IF NOT "%TARGET%"=="arm64" (
xcopy /f /y "!BUILD_DIR!\graphene-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libcrypto-1_1-x64.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libgmp-10.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libgnutls-30.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libhogweed-4.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libjpeg-8.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libnettle-6.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libogg-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libopus-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libpng16-16.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libssl-1_1-x64.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libtasn1-6.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libtheora-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libtheoradec-1.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libtheoraenc-1.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libusrsctp-1.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libvorbis-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libvorbisenc-2.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\libwinpthread-1.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\nice-10.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\opus-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\pcre2-8-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\theora-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\theoradec-1.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\theoraenc-1.dll" "!SERVO_UNITY_BINDIR!"
) ELSE (
xcopy /f /y "!BUILD_DIR!\avresample-4.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\postproc-55.dll" "!SERVO_UNITY_BINDIR!"
Expand Down Expand Up @@ -170,10 +169,8 @@ IF "%COPY_TO_SERVOUNITY%"=="YES" (
xcopy /f /y "!BUILD_DIR!\gsttag-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gsttypefindfunctions.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideo-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideoconvert.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideofilter.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideoparsersbad.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideoscale.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvolume.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstwasapi.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstwebrtc-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
Expand All @@ -185,12 +182,18 @@ IF "%COPY_TO_SERVOUNITY%"=="YES" (
xcopy /f /y "!BUILD_DIR!\gstogg.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstopengl.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstopus.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstplay-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstrtp.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstrtpmanager.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstsctp-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gsttheora.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideoconvertscale.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvorbis.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvpx.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstwebrtc.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstwebrtcnice-1.0-0.dll" "!SERVO_UNITY_BINDIR!"
) ELSE (
xcopy /f /y "!BUILD_DIR!\gstvideoconvert.dll" "!SERVO_UNITY_BINDIR!"
xcopy /f /y "!BUILD_DIR!\gstvideoscale.dll" "!SERVO_UNITY_BINDIR!"
)
)
2 changes: 1 addition & 1 deletion components/servo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ max_log_level = ["log/release_max_level_info"]
media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
multiview = ["compositing/multiview", "constellation/multiview"]
native-bluetooth = ["bluetooth/native-bluetooth"]
no-wgl = ["canvas/no-wgl"]
no-wgl = ["canvas/no-wgl", "surfman/sm-no-wgl"]
dynamic_freetype = ["webrender/dynamic_freetype"]
profilemozjs = ["script/profilemozjs"]
refcell_backtrace = ["script/refcell_backtrace"]
Expand Down
2 changes: 1 addition & 1 deletion ports/libsimpleservo2/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ js_backtrace = ["libservo/js_backtrace"]
max_log_level = ["log/release_max_level_info"]
media-gstreamer = ["libservo/media-gstreamer"]
native-bluetooth = ["libservo/native-bluetooth"]
no-wgl = ["libservo/no-wgl"]
no-wgl = ["libservo/no-wgl", "surfman/sm-no-wgl"]
profilemozjs = ["libservo/profilemozjs"]
refcell_backtrace = ["libservo/refcell_backtrace"]
uwp = ["webxr/openxr-api"]
Expand Down

0 comments on commit 3f6aa72

Please sign in to comment.