Skip to content

Commit 1b2af3b

Browse files
rodlierodlie
committed
Build stuff #126 
1 parent ba3c0fe commit 1b2af3b

9 files changed

+36
-35
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ ffmpeg
2222
distfiles
2323
backup
2424
CHANGES.md
25+
friction-distfiles

‎src/core/appsupport.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ const QString AppSupport::getAppBuildInfo(bool html)
181181
branch);
182182
} else {
183183
return QString("%1 <a href=\"%5/%2\">%2</a> %3 <a href=\"%6/%4\">%4</a>.")
184-
.arg(tr("Built from"),
184+
.arg(tr("Built from commit"),
185185
commit,
186-
tr("on"),
186+
tr("on branch"),
187187
branch,
188188
getAppCommitUrl(),
189189
getAppBranchUrl());

‎src/scripts/build_qt5.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ REM # GPLv3+
77
set CWD=%cd%
88
set SRC_DIR=%CWD%\src
99
set QT_DIR=%SRC_DIR%\qt
10-
set QT_V=5.15.12
10+
set QT_V=5.15.13
1111

12-
set PATH=%ProgramFiles%\Python311;%ProgramFiles%\CMake\bin;%PATH%
12+
set PATH=C:\Python;%ProgramFiles%\CMake\bin;%PATH%
1313

1414
cd "%SRC_DIR%\qt-everywhere-src-%QT_V%"
1515
nmake

‎src/scripts/build_vfxplatform.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ REL=${REL:-1}
2828
BRANCH=${BRANCH:-""}
2929
COMMIT=${COMMIT:-""}
3030
TAG=${TAG:-""}
31-
MKJOBS=${MKJOBS:-4}
31+
MKJOBS=${MKJOBS:-32}
3232
SDK_VERSION=${SDK_VERSION:-""}
3333
ONLY_SDK=${ONLY_SDK:-0}
3434
SDK_TAR="${DISTFILES}/friction-vfxplatform-sdk-${SDK_VERSION}.tar"

‎src/scripts/build_vfxplatform_sdk01.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ clang -v
2626
SDK=${SDK:-"/opt/friction"}
2727
SRC=${SDK}/src
2828
DIST=${DIST:-"/mnt"}
29-
JOBS=${JOBS:-4}
29+
MKJOBS=${MKJOBS:-32}
3030

3131
NINJA_V=1.11.1
3232
#GN_V=82d673ac
@@ -98,7 +98,7 @@ fi # ninja
9898
# mv ${SKIA_SRC} ${SKIA_DIR}
9999
# cd ${SKIA_DIR}
100100
# ${GN_BIN} gen out/build --args='is_official_build=true is_debug=false cc="clang" cxx="clang++" extra_cflags=["-Wno-error"] target_os="linux" target_cpu="x64" skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_system_icu=false skia_use_system_harfbuzz=false skia_use_dng_sdk=false'
101-
# ${NINJA_BIN} -C out/build -j${JOBS} skia
101+
# ${NINJA_BIN} -C out/build -j${MKJOBS} skia
102102
# fi # skia
103103

104104
# libunwind
@@ -109,7 +109,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libunwind.pc" ]; then
109109
tar xf ${DIST}/${UNWIND_SRC}.tar.gz
110110
cd ${UNWIND_SRC}
111111
CC=clang CXX=clang++ ./configure ${DEFAULT_CONFIGURE} --disable-minidebuginfo --disable-tests
112-
make -j${JOBS}
112+
make -j${MKJOBS}
113113
make install
114114
fi # libunwind
115115

@@ -128,7 +128,7 @@ fi # libunwind
128128
# CXXFLAGS="${DEFAULT_CFLAGS}" \
129129
# LDFLAGS="${DEFAULT_LDFLAGS} -lunwind" \
130130
# ./configure ${STATIC_CONFIGURE} --enable-libunwind
131-
# make -j${JOBS}
131+
# make -j${MKJOBS}
132132
# fi # gperftools
133133

134134
echo "SDK PART 1 DONE"

‎src/scripts/build_vfxplatform_sdk02.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ gcc -v
2626
SDK=${SDK:-"/opt/friction"}
2727
SRC=${SDK}/src
2828
DIST=${DIST:-"/mnt"}
29-
JOBS=${JOBS:-4}
29+
MKJOBS=${MKJOBS:-32}
3030

3131
XKBCOMMON_V=0.7.1
32-
QT_V=5.15.12 #5.12.12
32+
QT_V=5.15.13
3333
QSCINTILLA_V=2.14.1
3434
PELF_V=0.17.0
3535
CMAKE_V=3.26.3
@@ -69,7 +69,7 @@ if [ ! -f "${PELF_BIN}" ]; then
6969
tar xf ${DIST}/${PELF_SRC}.tar.bz2
7070
cd ${PELF_SRC}
7171
./configure ${COMMON_CONFIGURE}
72-
make -j${JOBS}
72+
make -j${MKJOBS}
7373
make install
7474
fi # patchelf
7575

@@ -81,7 +81,7 @@ if [ ! -f "${CMAKE_BIN}" ]; then
8181
tar xf ${DIST}/mxe/pkg/${CMAKE_SRC}.tar.gz
8282
cd ${CMAKE_SRC}
8383
./configure ${COMMON_CONFIGURE} -- -DCMAKE_USE_OPENSSL=OFF
84-
make -j${JOBS}
84+
make -j${MKJOBS}
8585
make install
8686
fi # cmake
8787

@@ -93,7 +93,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/xkbcommon.pc" ]; then
9393
tar xf ${DIST}/${XKB_SRC}.tar.xz
9494
cd ${XKB_SRC}
9595
./configure ${DEFAULT_CONFIGURE} --disable-docs
96-
make -j${JOBS}
96+
make -j${MKJOBS}
9797
make install
9898
fi # libxkbcommon
9999

@@ -194,7 +194,7 @@ if [ ! -f "${QMAKE_BIN}" ]; then
194194
-skip qtx11extras \
195195
-skip qtxmlpatterns \
196196
-skip qttools
197-
make -j${JOBS}
197+
make -j${MKJOBS}
198198
make install
199199
fi # qt
200200

@@ -207,7 +207,7 @@ if [ ! -f "${SDK}/lib/libqscintilla2_friction_qt5.so" ]; then
207207
cd ${QSC_SRC}/src
208208
sed -i 's/qscintilla2_qt/qscintilla2_friction_qt/g' qscintilla.pro
209209
${SDK}/bin/qmake CONFIG+=release
210-
make -j${JOBS}
210+
make -j${MKJOBS}
211211
cp -a libqscintilla2_friction_qt5* ${SDK}/lib/
212212
cp -a Qsci ${SDK}/include/
213213
fi # qscintilla

‎src/scripts/build_vfxplatform_sdk03.sh

+14-14
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gcc -v
2626
SDK=${SDK:-"/opt/friction"}
2727
SRC=${SDK}/src
2828
DIST=${DIST:-"/mnt/mxe/pkg"}
29-
JOBS=${JOBS:-4}
29+
MKJOBS=${MKJOBS:-32}
3030

3131
# Keep in sync with https://github.com/friction2d/mxe
3232
ZLIB_V=1.2.13
@@ -74,7 +74,7 @@ if [ ! -f "${SDK}/bin/nasm" ]; then
7474
tar xf ${DIST}/${NASM_SRC}.tar.xz
7575
cd ${NASM_SRC}
7676
./configure ${COMMON_CONFIGURE}
77-
make -j${JOBS}
77+
make -j${MKJOBS}
7878
make install
7979
fi # nasm
8080

@@ -99,7 +99,7 @@ if [ ! -f "${SDK}/lib/libz.so" ]; then
9999
tar xf ${DIST}/${ZLIB_SRC}.tar.xz
100100
cd ${ZLIB_SRC}
101101
./configure ${COMMON_CONFIGURE}
102-
make -j${JOBS}
102+
make -j${MKJOBS}
103103
make install
104104
fi # zlib
105105

@@ -114,7 +114,7 @@ if [ ! -f "${SDK}/lib/libmp3lame.so" ]; then
114114
CXXFLAGS="${DEFAULT_CFLAGS}" \
115115
LDFLAGS="${DEFAULT_LDFLAGS}" \
116116
./configure ${DEFAULT_CONFIGURE} --disable-frontend --disable-gtktest --with-fileio=lame --enable-nasm
117-
make -j${JOBS}
117+
make -j${MKJOBS}
118118
make install
119119
fi # lame
120120

@@ -129,7 +129,7 @@ if [ ! -f "${SDK}/lib/libvpx.so" ]; then
129129
CXXFLAGS="${DEFAULT_CFLAGS}" \
130130
LDFLAGS="${DEFAULT_LDFLAGS}" \
131131
./configure ${DEFAULT_CONFIGURE} --disable-examples --disable-install-docs
132-
make -j${JOBS}
132+
make -j${MKJOBS}
133133
make install
134134
fi # libvpx
135135

@@ -144,7 +144,7 @@ if [ ! -f "${SDK}/lib/libogg.so" ]; then
144144
CXXFLAGS="${DEFAULT_CFLAGS}" \
145145
LDFLAGS="${DEFAULT_LDFLAGS}" \
146146
./configure ${DEFAULT_CONFIGURE}
147-
make -j${JOBS}
147+
make -j${MKJOBS}
148148
make install
149149
fi # libogg
150150

@@ -159,7 +159,7 @@ if [ ! -f "${SDK}/lib/libvorbis.so" ]; then
159159
CXXFLAGS="${DEFAULT_CFLAGS}" \
160160
LDFLAGS="${DEFAULT_LDFLAGS}" \
161161
./configure ${DEFAULT_CONFIGURE}
162-
make -j${JOBS}
162+
make -j${MKJOBS}
163163
make install
164164
fi # libvorbis
165165

@@ -174,7 +174,7 @@ if [ ! -f "${SDK}/lib/libtheora.so" ]; then
174174
CXXFLAGS="${DEFAULT_CFLAGS}" \
175175
LDFLAGS="${DEFAULT_LDFLAGS}" \
176176
./configure ${DEFAULT_CONFIGURE} --disable-examples --disable-sdltest
177-
make -j${JOBS}
177+
make -j${MKJOBS}
178178
make install
179179
fi # libtheora
180180

@@ -188,7 +188,7 @@ if [ ! -f "${SDK}/lib/libxvidcore.so" ]; then
188188
CXXFLAGS="${DEFAULT_CFLAGS}" \
189189
LDFLAGS="${DEFAULT_LDFLAGS}" \
190190
./configure ${COMMON_CONFIGURE}
191-
make -j${JOBS}
191+
make -j${MKJOBS}
192192
make install
193193
fi # xvidcore
194194

@@ -203,7 +203,7 @@ if [ ! -f "${SDK}/lib/liblsmash.so" ]; then
203203
CXXFLAGS="${DEFAULT_CFLAGS}" \
204204
LDFLAGS="${DEFAULT_LDFLAGS}" \
205205
./configure ${DEFAULT_CONFIGURE}
206-
make -j${JOBS}
206+
make -j${MKJOBS}
207207
make install
208208
fi # liblsmash
209209

@@ -218,7 +218,7 @@ if [ ! -f "${SDK}/lib/libx264.so" ]; then
218218
CXXFLAGS="${DEFAULT_CFLAGS}" \
219219
LDFLAGS="${DEFAULT_LDFLAGS}" \
220220
./configure ${COMMON_CONFIGURE} --enable-shared --disable-lavf --disable-swscale --disable-opencl --disable-cli
221-
make -j${JOBS}
221+
make -j${MKJOBS}
222222
make install
223223
fi # x264
224224

@@ -238,7 +238,7 @@ if [ ! -f "${SDK}/lib/libx265.so" ]; then
238238
-DCMAKE_BUILD_TYPE=Release \
239239
-DENABLE_SHARED=ON \
240240
-DENABLE_CLI=OFF ..
241-
make -j${JOBS}
241+
make -j${MKJOBS}
242242
make install
243243
rm ${SDK}/lib/libx265.a
244244
fi # x265
@@ -266,7 +266,7 @@ if [ ! -f "${SDK}/lib/libaom.so" ]; then
266266
-DCONFIG_AV1_HIGHBITDEPTH=0 \
267267
-DCONFIG_WEBM_IO=0 \
268268
-DBUILD_SHARED_LIBS=ON ..
269-
make -j${JOBS}
269+
make -j${MKJOBS}
270270
make install
271271
rm ${SDK}/lib/libaom.a
272272
fi # aom
@@ -313,7 +313,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libavcodec.pc" ]; then
313313
--enable-libaom \
314314
--enable-libx265 \
315315
--enable-libxvid
316-
make -j${JOBS}
316+
make -j${MKJOBS}
317317
make install
318318
fi # ffmpeg
319319

‎src/scripts/configure_qt5.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ REM # GPLv3+
77
set CWD=%cd%
88
set SRC_DIR=%CWD%\src
99
set QT_DIR=%SRC_DIR%\qt
10-
set QT_V=5.15.12
10+
set QT_V=5.15.13
1111

12-
set PATH=%ProgramFiles%\Python311;%ProgramFiles%\CMake\bin;%PATH%
12+
set PATH=C:\Python;%ProgramFiles%\CMake\bin;%PATH%
1313

1414
cd "%SRC_DIR%\qt-everywhere-src-%QT_V%"
15-
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-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
15+
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

‎src/scripts/run_vfxplatform.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ REL=${REL:-0}
2525
BRANCH=${BRANCH:-""}
2626
COMMIT=${COMMIT:-""}
2727
TAG=${TAG:-""}
28-
MKJOBS=${JOBS:-4}
28+
MKJOBS=${MKJOBS:-32}
2929
ONLY_SDK=${ONLY_SDK:-0}
3030
DOWNLOAD_SDK=${DOWNLOAD_SDK:-0}
31-
SDK_VERSION="20240123"
31+
SDK_VERSION="20240424"
3232
TAR_VERSION=${TAR_VERSION:-""}
3333

3434
DOCKER="docker run"

0 commit comments

Comments
 (0)