Update SDK

friction2d · Sep 15, 2024 · b26df7e · b26df7e
1 parent e52b11d
commit b26df7e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/src/scripts/build.bat b/src/scripts/build.bat
@@ -36,8 +36,8 @@ set COMMIT=
 for /f %%i in ('git rev-parse --short^=8 HEAD') do set COMMIT=%%i
 
 if not exist "sdk\" ( 
-    curl -OL "https://github.com/friction2d/friction-sdk/releases/download/%SDK_VERSION%/friction-sdk-%SDK_VERSION%-windows-x64.7z"
-    7z x friction-sdk-%SDK_VERSION%-windows-x64.7z
+    curl -OL "https://github.com/friction2d/friction-sdk/releases/download/%SDK_VERSION%/friction-msvc-2017-sdk-%SDK_VERSION%.7z"
+    7z x friction-msvc-2017-sdk-%SDK_VERSION%.7z
 )
 
 if exist "build\" (

diff --git a/src/scripts/build_vfxplatform_sdk02.sh b/src/scripts/build_vfxplatform_sdk02.sh
@@ -198,6 +198,28 @@ if [ ! -f "${CMAKE_BIN}" ]; then
 fi # cmake
 
 # qt
+#    -no-feature-bearermanagement \
+#    -no-feature-dnslookup \
+#    -no-feature-dtls \
+#    -no-feature-ftp \
+#    -no-feature-gssapi \
+#    -no-feature-http \
+#    -no-feature-localserver \
+#    -no-feature-netlistmgr \
+#    -no-feature-networkdiskcache \
+#    -no-feature-networkinterface \
+#    -no-feature-networkproxy \
+#    -no-feature-qml-network \
+#    -no-feature-qml-xml-http-request \
+#    -no-feature-qml-animation \
+#    -no-feature-socks5 \
+#    -no-feature-sspi \
+#    -no-feature-udpsocket \
+#    -no-feature-printdialog \
+#    -no-feature-printer \
+#    -no-feature-printpreviewdialog \
+#    -no-feature-printpreviewwidget \
+#    -no-feature-pdf \
 if [ ! -f "${QMAKE_BIN}" ]; then
     cd ${SRC}
     QT_SRC="qt-everywhere-src-${QT_V}"
@@ -260,28 +282,6 @@ if [ ! -f "${QMAKE_BIN}" ]; then
     -no-linuxfb \
     -nomake examples \
     -nomake tests \
-    -no-feature-bearermanagement \
-    -no-feature-dnslookup \
-    -no-feature-dtls \
-    -no-feature-ftp \
-    -no-feature-gssapi \
-    -no-feature-http \
-    -no-feature-localserver \
-    -no-feature-netlistmgr \
-    -no-feature-networkdiskcache \
-    -no-feature-networkinterface \
-    -no-feature-networkproxy \
-    -no-feature-qml-network \
-    -no-feature-qml-xml-http-request \
-    -no-feature-qml-animation \
-    -no-feature-socks5 \
-    -no-feature-sspi \
-    -no-feature-udpsocket \
-    -no-feature-printdialog \
-    -no-feature-printer \
-    -no-feature-printpreviewdialog \
-    -no-feature-printpreviewwidget \
-    -no-feature-pdf \
     -skip qt3d \
     -skip qtactiveqt \
     -skip qtcanvas3d \

diff --git a/src/scripts/configure_qt5.bat b/src/scripts/configure_qt5.bat
@@ -12,4 +12,6 @@ set QT_V=5.15.15
 set PATH=C:\Python;%ProgramFiles%\CMake\bin;%PATH%
 
 cd "%SRC_DIR%\qt-everywhere-src-%QT_V%"
-configure.bat -release -prefix "%QT_DIR%" -mp -platform win32-msvc -opensource -confirm-license -nomake examples -nomake tests -opengl desktop -optimize-size -no-pch -no-glib -no-dbus -no-avx2 -no-avx512 -strip -no-openssl -no-gif -no-wmf -no-ico -schannel -no-feature-bearermanagement -no-feature-dnslookup -no-feature-dtls -no-feature-ftp -no-feature-gssapi -no-feature-http -no-feature-localserver -no-feature-netlistmgr -no-feature-networkdiskcache -no-feature-networkinterface -no-feature-networkproxy -no-feature-qml-network -no-feature-qml-xml-http-request -no-feature-qml-animation -no-feature-socks5 -no-feature-sspi -no-feature-udpsocket -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-pdf -skip qt3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtlocation -skip qtlottie -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtvirtualkeyboard -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -skip qttools
+REM -no-feature-bearermanagement -no-feature-dnslookup -no-feature-dtls -no-feature-ftp -no-feature-gssapi -no-feature-http -no-feature-localserver -no-feature-netlistmgr -no-feature-networkdiskcache -no-feature-networkinterface -no-feature-networkproxy -no-feature-qml-network -no-feature-qml-xml-http-request -no-feature-qml-animation -no-feature-socks5 -no-feature-sspi -no-feature-udpsocket
+REM -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-pdf
+configure.bat -release -prefix "%QT_DIR%" -mp -platform win32-msvc -opensource -confirm-license -nomake examples -nomake tests -opengl desktop -optimize-size -no-pch -no-glib -no-dbus -no-avx2 -no-avx512 -strip -no-openssl -no-gif -no-wmf -no-ico -schannel -skip qt3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtlocation -skip qtlottie -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtvirtualkeyboard -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -skip qttools