Skip to content

Commit 19e5ad4

Browse files
GerHobbeltGerHobbelt
committed
updated submodules: jpeg-turbo et al
1 parent ff3cb3f commit 19e5ad4

11 files changed

+158
-168
lines changed

‎platform/win32/libQuickJS.vcxproj

+9-10
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5353
<Import Project="$(SolutionDir)\common-project.props" Label="SolutionWideSettings" />
5454
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
55-
<Import Project="$(SolutionDir)\common-project-Debug-Win32.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win32.props')" Label="SolutionWideDebugWin32Settings" />
55+
<Import Project="$(SolutionDir)\common-project-Debug-Win32.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win32.props')" Label="SolutionWideDebugWin32Settings" />
5656
</ImportGroup>
5757
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
58-
<Import Project="$(SolutionDir)\common-project-Release-Win32.props" Condition="exists('$(SolutionDir)\common-project-Release-Win32.props')" Label="SolutionWideReleaseWin32Settings" />
58+
<Import Project="$(SolutionDir)\common-project-Release-Win32.props" Condition="exists('$(SolutionDir)\common-project-Release-Win32.props')" Label="SolutionWideReleaseWin32Settings" />
5959
</ImportGroup>
6060
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
61-
<Import Project="$(SolutionDir)\common-project-Debug-Win64.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win64.props')" Label="SolutionWideDebugWin64Settings" />
61+
<Import Project="$(SolutionDir)\common-project-Debug-Win64.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win64.props')" Label="SolutionWideDebugWin64Settings" />
6262
</ImportGroup>
6363
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
64-
<Import Project="$(SolutionDir)\common-project-Release-Win64.props" Condition="exists('$(SolutionDir)\common-project-Release-Win64.props')" Label="SolutionWideReleaseWin64Settings" />
64+
<Import Project="$(SolutionDir)\common-project-Release-Win64.props" Condition="exists('$(SolutionDir)\common-project-Release-Win64.props')" Label="SolutionWideReleaseWin64Settings" />
6565
</ImportGroup>
6666
<ImportGroup Label="ExtensionSettings">
6767
</ImportGroup>
@@ -110,7 +110,7 @@
110110
<WholeProgramOptimization>true</WholeProgramOptimization>
111111
<LinkIncremental>false</LinkIncremental>
112112
</PropertyGroup>
113-
<ItemDefinitionGroup>
113+
<ItemDefinitionGroup>
114114
<ClCompile>
115115
<Optimization>Custom</Optimization>
116116
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -144,8 +144,8 @@
144144
<RuntimeTypeInfo>true</RuntimeTypeInfo>
145145
<AdditionalOptions>/bigobj /utf-8 /Zc:__cplusplus /Zc:preprocessor %(AdditionalOptions)</AdditionalOptions>
146146
</ClCompile>
147-
</ItemDefinitionGroup>
148-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
147+
</ItemDefinitionGroup>
148+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
149149
<Midl>
150150
<PreprocessorDefinitions>BUILD_MONOLITHIC;BUILDING_LIBQUICKJS;QUICKJS_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151151
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -355,7 +355,7 @@
355355
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs-find-module.c" />
356356
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs-libc.c" />
357357
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs-port.c" />
358-
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs.c" />
358+
<ClCompile Include="..\..\thirdparty\owemdjee\QuickJS\quickjs.c" />
359359
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs_dump_flags.c" />
360360
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/unicode_gen.c" />
361361
<ClInclude Include="../../thirdparty/owemdjee/QuickJS/config.h" />
@@ -446,5 +446,4 @@
446446
<Text Include="../../thirdparty/owemdjee/QuickJS/unicode_download.sh" />
447447
</ItemGroup>
448448
<Import Project="$(SolutionDir)\common-project-ultimate-override.props" Label="SolutionWideSettingsOverride" />
449-
</Project>
450-
449+
</Project>

‎platform/win32/libQuickJS.vcxproj.filters

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs-port.c">
9393
<Filter>Source Files</Filter>
9494
</ClCompile>
95-
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs.c">
95+
<ClCompile Include="..\..\thirdparty\owemdjee\QuickJS\quickjs.c">
9696
<Filter>Source Files</Filter>
9797
</ClCompile>
9898
<ClCompile Include="../../thirdparty/owemdjee/QuickJS/quickjs_dump_flags.c">
@@ -360,4 +360,4 @@
360360
<Filter>Misc Files</Filter>
361361
</Text>
362362
</ItemGroup>
363-
</Project>
363+
</Project>

‎platform/win32/libjpeg-turbo.vcxproj

+13-8
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@
328328
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/md5.c" />
329329
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/md5cmp.c" />
330330
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/md5hl.c" />
331+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/md5sum.c" />
331332
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/rdbmp.c" />
332333
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/rdcolmap.c" />
333334
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/rdgif.c" />
@@ -338,7 +339,9 @@
338339
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/strtest.c" />
339340
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/test_intrinsic_bitcount.c" />
340341
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjbench.c" />
341-
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjexample.c" />
342+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjcomp.c" />
343+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjdecomp.c" />
344+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjtran.c" />
342345
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjunittest.c" />
343346
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjutil.c" />
344347
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/transupp.c" />
@@ -405,7 +408,7 @@
405408
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/src/transupp.h" />
406409
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/src/turbojpeg.h" />
407410
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test1.icc" />
408-
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test2.icc" />
411+
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test3.icc" />
409412
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/win/vc/jconfig.h" />
410413
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/win/vc/jconfigint.h" />
411414
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/turbojpeg/bc_s.png" />
@@ -429,7 +432,7 @@
429432
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/turbojpeg/tab_hd.png" />
430433
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/turbojpeg/tab_s.png" />
431434
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/turbojpeg/tab_sd.png" />
432-
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/big_tree8.bmp" />
435+
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/shira_bird8.bmp" />
433436
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/testimgari.jpg" />
434437
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/testimgint.jpg" />
435438
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/testorig.jpg" />
@@ -522,7 +525,7 @@
522525
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/cmakescripts/cmake_uninstall.cmake.in" />
523526
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/cmakescripts/testclean.cmake" />
524527
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/cmakescripts/tjbenchtest.cmake" />
525-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/croptest.in" />
528+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/cmakescripts/tjexampletest.cmake" />
526529
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/cjpeg.1" />
527530
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/coderules.txt" />
528531
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/djpeg.1" />
@@ -627,11 +630,13 @@
627630
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/src/libjpeg.map.in" />
628631
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/CMakeLists.txt" />
629632
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/src/turbojpeg-mapfile" />
630-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/big_tree8.txt" />
633+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/croptest.in" />
634+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjbenchtest.in" />
635+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjcomptest.in" />
636+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjdecomptest.in" />
637+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjtrantest.in" />
631638
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test1.icc.txt" />
632-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test2.icc.txt" />
633-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/tjbenchtest.in" />
634-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/tjexampletest.in" />
639+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test3.icc.txt" />
635640
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/win/gcc/projectTargets-release.cmake.in" />
636641
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/win/jpeg.rc.in" />
637642
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/win/jpeg62-ro.def" />

‎platform/win32/libjpeg-turbo.vcxproj.filters

+45-27
Original file line numberDiff line numberDiff line change
@@ -76,44 +76,47 @@
7676
<Filter Include="Misc Files\src\md5">
7777
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0018}</UniqueIdentifier>
7878
</Filter>
79-
<Filter Include="Misc Files\testimages">
79+
<Filter Include="Misc Files\test">
8080
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0019}</UniqueIdentifier>
8181
</Filter>
82-
<Filter Include="Misc Files\win">
82+
<Filter Include="Misc Files\testimages">
8383
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0020}</UniqueIdentifier>
8484
</Filter>
85-
<Filter Include="Misc Files\win\gcc">
85+
<Filter Include="Misc Files\win">
8686
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0021}</UniqueIdentifier>
8787
</Filter>
88-
<Filter Include="Misc Files\win\vc">
88+
<Filter Include="Misc Files\win\gcc">
8989
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0022}</UniqueIdentifier>
9090
</Filter>
91-
<Filter Include="Resource Files">
91+
<Filter Include="Misc Files\win\vc">
9292
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0023}</UniqueIdentifier>
9393
</Filter>
94+
<Filter Include="Resource Files">
95+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0024}</UniqueIdentifier>
96+
</Filter>
9497
<Filter Include="Resource Files\doc">
95-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0025}</UniqueIdentifier>
98+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0026}</UniqueIdentifier>
9699
</Filter>
97100
<Filter Include="Resource Files\doc\turbojpeg">
98-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0024}</UniqueIdentifier>
101+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0025}</UniqueIdentifier>
99102
</Filter>
100103
<Filter Include="Resource Files\testimages">
101-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0026}</UniqueIdentifier>
104+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0027}</UniqueIdentifier>
102105
</Filter>
103106
<Filter Include="Source Files\simd">
104-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0028}</UniqueIdentifier>
107+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0029}</UniqueIdentifier>
105108
</Filter>
106109
<Filter Include="Source Files\simd\i386">
107-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0027}</UniqueIdentifier>
110+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0028}</UniqueIdentifier>
108111
</Filter>
109112
<Filter Include="Source Files\simd\x86_64">
110-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0029}</UniqueIdentifier>
113+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0030}</UniqueIdentifier>
111114
</Filter>
112115
<Filter Include="Source Files\src">
113-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0030}</UniqueIdentifier>
116+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0031}</UniqueIdentifier>
114117
</Filter>
115118
<Filter Include="Source Files\src\md5">
116-
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0031}</UniqueIdentifier>
119+
<UniqueIdentifier>{d2a97047-4937-4f7a-ab2f-4485e03f0032}</UniqueIdentifier>
117120
</Filter>
118121
</ItemGroup>
119122
<ItemGroup>
@@ -348,6 +351,9 @@
348351
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/md5hl.c">
349352
<Filter>Source Files\src\md5</Filter>
350353
</ClCompile>
354+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/md5/md5sum.c">
355+
<Filter>Source Files\src\md5</Filter>
356+
</ClCompile>
351357
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/rdbmp.c">
352358
<Filter>Source Files\src</Filter>
353359
</ClCompile>
@@ -378,7 +384,13 @@
378384
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjbench.c">
379385
<Filter>Source Files\src</Filter>
380386
</ClCompile>
381-
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjexample.c">
387+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjcomp.c">
388+
<Filter>Source Files\src</Filter>
389+
</ClCompile>
390+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjdecomp.c">
391+
<Filter>Source Files\src</Filter>
392+
</ClCompile>
393+
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjtran.c">
382394
<Filter>Source Files\src</Filter>
383395
</ClCompile>
384396
<ClCompile Include="../../thirdparty/owemdjee/libjpeg-turbo/src/tjunittest.c">
@@ -579,7 +591,7 @@
579591
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test1.icc">
580592
<Filter>Header Files\testimages</Filter>
581593
</ClInclude>
582-
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test2.icc">
594+
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test3.icc">
583595
<Filter>Header Files\testimages</Filter>
584596
</ClInclude>
585597
<ClInclude Include="../../thirdparty/owemdjee/libjpeg-turbo/win/vc/jconfig.h">
@@ -651,7 +663,7 @@
651663
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/turbojpeg/tab_sd.png">
652664
<Filter>Resource Files\doc\turbojpeg</Filter>
653665
</Image>
654-
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/big_tree8.bmp">
666+
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/shira_bird8.bmp">
655667
<Filter>Resource Files\testimages</Filter>
656668
</Image>
657669
<Image Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/testimgari.jpg">
@@ -930,8 +942,8 @@
930942
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/cmakescripts/tjbenchtest.cmake">
931943
<Filter>Misc Files\cmakescripts</Filter>
932944
</Text>
933-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/croptest.in">
934-
<Filter>Misc Files</Filter>
945+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/cmakescripts/tjexampletest.cmake">
946+
<Filter>Misc Files\cmakescripts</Filter>
935947
</Text>
936948
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/doc/cjpeg.1">
937949
<Filter>Misc Files\doc</Filter>
@@ -1245,21 +1257,27 @@
12451257
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/src/turbojpeg-mapfile">
12461258
<Filter>Misc Files\src</Filter>
12471259
</Text>
1248-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/big_tree8.txt">
1249-
<Filter>Misc Files\testimages</Filter>
1260+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/croptest.in">
1261+
<Filter>Misc Files\test</Filter>
1262+
</Text>
1263+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjbenchtest.in">
1264+
<Filter>Misc Files\test</Filter>
1265+
</Text>
1266+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjcomptest.in">
1267+
<Filter>Misc Files\test</Filter>
1268+
</Text>
1269+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjdecomptest.in">
1270+
<Filter>Misc Files\test</Filter>
1271+
</Text>
1272+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/test/tjtrantest.in">
1273+
<Filter>Misc Files\test</Filter>
12501274
</Text>
12511275
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test1.icc.txt">
12521276
<Filter>Misc Files\testimages</Filter>
12531277
</Text>
1254-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test2.icc.txt">
1278+
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/testimages/test3.icc.txt">
12551279
<Filter>Misc Files\testimages</Filter>
12561280
</Text>
1257-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/tjbenchtest.in">
1258-
<Filter>Misc Files</Filter>
1259-
</Text>
1260-
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/tjexampletest.in">
1261-
<Filter>Misc Files</Filter>
1262-
</Text>
12631281
<Text Include="../../thirdparty/owemdjee/libjpeg-turbo/win/gcc/projectTargets-release.cmake.in">
12641282
<Filter>Misc Files\win\gcc</Filter>
12651283
</Text>

0 commit comments

Comments
 (0)