Skip to content

Commit ef1a8dc

Browse files
g-maximeg-maxime
committed
TEST
Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>
1 parent e6c82f6 commit ef1a8dc

13 files changed

Lines changed: 15 additions & 17 deletions

File tree

‎.github/workflows/MediaConch_Checks.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pip --disable-pip-version-check install git+https://github.com/vi/mkvparse.git
2727
fi
2828
if [ "$RUNNER_OS" == "macOS" ]; then
29-
brew install libtool automake libxslt jansson qt@5 sfk xmlstarlet ffmpeg
29+
brew install libtool automake libxslt jansson qt sfk xmlstarlet ffmpeg
3030
sudo pip --disable-pip-version-check install --prefix /usr/local git+https://github.com/vi/mkvparse.git
3131
fi
3232
- name: Get ZenLib info
@@ -89,8 +89,8 @@ jobs:
8989
- name: Configure GUI
9090
run: |
9191
cd Project/Qt
92-
export PATH=/opt/homebrew/opt/qt@5/bin:$PATH
93-
./prepare CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9 QMAKE_LFLAGS-=-Wl,-ld_classic
92+
export PATH=/opt/homebrew/opt/qt/bin:$PATH
93+
./prepare
9494
- name: Build GUI
9595
run: |
9696
cd Project/Qt
@@ -245,6 +245,4 @@ jobs:
245245
msbuild-architecture: x64
246246
- name: Build
247247
run: |
248-
$Env:IncludePath="$Env:QT_ROOT_DIR\include\QtGui;$Env:QT_ROOT_DIR\include\QtWidgets;$Env:QT_ROOT_DIR\include\QtCore;$Env:QT_ROOT_DIR\include\QtWebEngine;$Env:QT_ROOT_DIR\include\QtWebEngineWidgets;$Env:QT_ROOT_DIR\include\QtWebEngineCore;$Env:QT_ROOT_DIR\include\QtWebChannel;$Env:QT_ROOT_DIR\include;$Env:IncludePath"
249-
$Env:LINK="/LIBPATH:$Env:QT_ROOT_DIR\lib"
250248
MSBuild /Verbosity:Quiet /p:Configuration=Release`;Platform=${{ matrix.arch }} MediaConch\Project\MSVC2022\MediaConch.sln

‎Project/GNU/CLI/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mediaconch_SOURCES = \
4646
../../../Source/Checker/Checker.cpp \
4747
../../../Source/Checker/Path.cpp \
4848
../../../Source/IMSC1/IMSC1Plugin.cpp \
49-
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
49+
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp
5050

5151
#mediaconch_LDFLAGS = -no-undefined -version-info 0:0:0
5252
mediaconch_CPPFLAGS = $(XML_CFLAGS)

‎Project/GNU/Library/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ lib@MediaConchLib_LibName@_la_SOURCES = \
4343
../../../Source/Checker/Checker.cpp \
4444
../../../Source/Checker/Path.cpp \
4545
../../../Source/IMSC1/IMSC1Plugin.cpp \
46-
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
46+
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp
4747

4848
#lib@MediaConchLib_LibName@includedir = $(includedir)/MediaConch
4949
#lib@MediaConchLib_LibName@include_HEADERS = \

‎Project/GNU/Server/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mediaconchd_SOURCES = \
4545
../../../Source/Checker/Checker.cpp \
4646
../../../Source/Checker/Path.cpp \
4747
../../../Source/IMSC1/IMSC1Plugin.cpp \
48-
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
48+
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp
4949

5050
#mediaconchd_LDFLAGS = -no-undefined -version-info 0:0:0
5151
mediaconchd_CPPFLAGS = $(XML_CFLAGS)

‎Project/MSVC2022/CLI/MediaConch.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
<ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
187187
<ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
188188
<ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
189-
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
189+
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml_wrapper.cpp" />
190190
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
191191
</ItemGroup>
192192
<ItemGroup>

‎Project/MSVC2022/DLL/MediaConch-DLL.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
185185
<ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
186186
<ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
187-
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
187+
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml_wrapper.cpp" />
188188
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
189189
</ItemGroup>
190190
<ItemGroup>

‎Project/MSVC2022/GUI/MediaConch_GUI.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<ClCompile Include="..\..\..\Source\GUI\Qt\WebKitPage.cpp" />
226226
<ClCompile Include="..\..\..\Source\GUI\Qt\WebKitView.cpp" />
227227
<ClCompile Include="..\..\..\Source\GUI\Qt\workerfiles.cpp" />
228-
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
228+
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml_wrapper.cpp" />
229229
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
230230
<ClCompile Include="_Automated\moc_commonwebwindow.cpp" />
231231
<ClCompile Include="_Automated\moc_helpwindow.cpp" />

‎Project/MSVC2022/Server/MediaConch-Server.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
181181
<ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
182182
<ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
183-
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
183+
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml_wrapper.cpp" />
184184
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
185185
</ItemGroup>
186186
<ItemGroup>

‎Project/Qt/MediaConch.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ SOURCES += ../../Source/Common/MediaConchLib.cpp \
7171
../../Source/Checker/Checker.cpp \
7272
../../Source/Checker/Path.cpp \
7373
../../Source/IMSC1/IMSC1Plugin.cpp \
74-
../../Source/ThirdParty/tfsxml/tfsxml.cpp \
74+
../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp \
7575
../../Source/GUI/Qt/main.cpp \
7676
../../Source/GUI/Qt/commonwebwindow.cpp \
7777
../../Source/GUI/Qt/helpwindow.cpp \

‎Source/Checker/Makefile.emscripten‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ all: PolicyCheckerWasm.js PolicyChecker.js
33
clean:
44
rm *.o ../ThirdParty/tfsxml/*.o
55

6-
PolicyChecker.js: ../ThirdParty/tfsxml/tfsxml.o Path.o Checker.o
6+
PolicyChecker.js: ../ThirdParty/tfsxml/tfsxml_wrapper.o Path.o Checker.o
77
em++ -std=c++11 -s WASM=0 -s TOTAL_MEMORY=67108864 -s NO_FILESYSTEM=1 -s MODULARIZE=1 -s EXPORT_NAME="'PolicyChecker'" --closure 0 -o $@ $(CXXFLAGS) --bind $^
88

9-
PolicyCheckerWasm.js: ../ThirdParty/tfsxml/tfsxml.o Path.o Checker.o
9+
PolicyCheckerWasm.js: ../ThirdParty/tfsxml/tfsxml_wrapper.o Path.o Checker.o
1010
em++ -std=c++11 -s WASM=1 -s TOTAL_MEMORY=33554432 -s ALLOW_MEMORY_GROWTH=1 -s NO_FILESYSTEM=1 -s MODULARIZE=1 -s EXPORT_NAME="'PolicyChecker'" --closure 0 -o $@ $(CXXFLAGS) --bind $^
1111

1212
%.o: %.cpp

0 commit comments

Comments
 (0)