Skip to content

Commit

Permalink
Update local toolkit submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
@hughsando
hughsando committed Jan 30, 2025
1 parent 2337047 commit a5d3ac3
Show file tree
Hide file tree
Showing 8 changed files with 132 additions and 130 deletions.
1 change: 1 addition & 0 deletions project/ToolkitBuild.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
<compilerflag value="-I${NME_PNG}"/>
<compilerflag value="-I${NME_PNG}.." if="NME_LOCAL_TOOLKIT" />
<compilerflag value="-I${NME_JPEG}"/>
<compilerflag value="-I${NME_JPEG}/src" if="NME_LOCAL_TOOLKIT" />
<compilerflag value="-I${NME_JPEG}.." if="NME_LOCAL_TOOLKIT" />
<compilerflag value="-I${NME_VORBIS}include"/>
<compilerflag value="-I${NME_OGG}include"/>
Expand Down
2 changes: 1 addition & 1 deletion project/toolkit/freetype/freetype
Submodule freetype updated 86 files
+9 −22 CMakeLists.txt
+3 −1 MSBuild.rsp
+4 −4 README
+2 −2 autogen.sh
+2 −2 builds/cmake/FindHarfBuzz.cmake
+1 −0 builds/compiler/gcc-dev.mk
+10 −3 builds/toplevel.mk
+8 −1 builds/unix/configure.raw
+3 −1 builds/unix/unix-cc.in
+1 −1 builds/vms/apinames_vms.bash
+1 −1 builds/wince/vc2005-ce/freetype.sln
+1 −1 builds/wince/vc2005-ce/index.html
+1 −1 builds/wince/vc2008-ce/index.html
+1 −1 builds/windows/ftdebug.c
+1 −1 builds/windows/ftsystem.c
+1 −1 builds/windows/vc2010/index.html
+1 −1 builds/windows/visualc/index.html
+1 −1 builds/windows/visualce/index.html
+32 −6 docs/CHANGES
+1 −0 docs/VERSIONS.TXT
+1 −1 docs/freetype-config.1
+1 −1 docs/markdown/javascripts/extra.js
+2 −2 docs/oldlogs/ChangeLog.210
+1 −1 include/freetype/freetype.h
+2 −2 include/freetype/ftcolor.h
+1 −1 include/freetype/ftdriver.h
+17 −8 include/freetype/ftimage.h
+3 −3 include/freetype/internal/ftcalc.h
+0 −6 include/freetype/internal/ftobjs.h
+1 −1 include/freetype/internal/fttrace.h
+3 −3 include/freetype/internal/sfnt.h
+2 −2 include/freetype/internal/tttypes.h
+3 −2 include/freetype/tttables.h
+45 −21 meson.build
+5 −0 meson_options.txt
+1 −1 src/autofit/afcjk.c
+8 −8 src/autofit/afhints.c
+1 −1 src/autofit/aflatin.c
+1 −1 src/autofit/afmodule.c
+1 −1 src/base/ftbbox.c
+9 −9 src/base/ftcalc.c
+1 −1 src/base/ftdebug.c
+11 −20 src/base/ftgloadr.c
+8 −8 src/base/ftobjs.c
+9 −7 src/base/ftoutln.c
+2 −2 src/base/ftstream.c
+19 −15 src/base/ftstroke.c
+1 −1 src/base/ftsynth.c
+3 −3 src/base/ftver.rc
+8 −37 src/bdf/bdf.h
+41 −26 src/bdf/bdfdrivr.c
+372 −931 src/bdf/bdflib.c
+3 −2 src/cache/ftcbasic.c
+46 −99 src/cff/cffdrivr.c
+11 −31 src/cff/cffgload.c
+5 −3 src/cff/cffobjs.c
+9 −15 src/cid/cidgload.c
+1 −1 src/pcf/pcfdrivr.c
+4 −4 src/pfr/pfrgload.c
+4 −8 src/pfr/pfrobjs.c
+2 −2 src/psaux/psintrp.c
+16 −19 src/psaux/psobjs.c
+4 −4 src/pshinter/pshalgo.c
+2 −2 src/raster/ftraster.c
+2 −2 src/sdf/ftbsdf.c
+2 −2 src/sdf/ftsdf.c
+1 −1 src/sdf/ftsdf.h
+1 −0 src/sfnt/rules.mk
+1 −1 src/sfnt/ttbdf.c
+8 −8 src/sfnt/ttcmap.c
+8 −16 src/sfnt/ttgpos.c
+1 −1 src/sfnt/ttload.c
+2 −2 src/sfnt/ttpost.c
+40 −3 src/sfnt/ttsbit.c
+10 −5 src/smooth/ftgrays.c
+25 −12 src/tools/apinames.c
+94 −120 src/truetype/ttgload.c
+68 −94 src/truetype/ttgxvar.c
+6 −8 src/truetype/ttinterp.c
+9 −15 src/truetype/ttobjs.c
+1 −1 src/truetype/ttobjs.h
+11 −17 src/type1/t1gload.c
+3 −3 src/winfonts/winfnt.c
+9 −9 subprojects/libpng.wrap
+9 −9 subprojects/zlib.wrap
+178 −177 vms_make.com
245 changes: 123 additions & 122 deletions project/toolkit/jpeg/files.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<xml>

<set name="NME_JPEG" value="${this_dir}/libjpeg-turbo/" />
<set name="NME_JPEG_SRC" value="${this_dir}/libjpeg-turbo/src/" />
<echo value="${INCLUDE}/" />

<!-- nasm on mac x64 generate a whole lot of warning messages. Nice just to skip it? -->
Expand All @@ -9,45 +10,45 @@


<files id="native-toolkit-jpeg-depends" >
<depend name="${NME_JPEG}/jpeglib.h"/>
<depend name="${NME_JPEG_SRC}/jpeglib.h"/>
<depend name="${NME_JPEG}/../jconfig.h"/>
</files>

<files id="native-toolkit-jpeg-depends-int" >
<depend name="${NME_JPEG}/jpeglib.h"/>
<depend name="${NME_JPEG_SRC}/jpeglib.h"/>
<depend name="${NME_JPEG}/../jconfig.h"/>
<depend name="${NME_JPEG}transupp.h"/>
<depend name="${NME_JPEG}jmemsys.h"/>
<depend name="${NME_JPEG}jmorecfg.h"/>
<depend name="${NME_JPEG}jpegint.h"/>
<depend name="${NME_JPEG}jinclude.h"/>
<depend name="${NME_JPEG}jerror.h"/>
<depend name="${NME_JPEG}jdct.h"/>
<depend name="${NME_JPEG_SRC}transupp.h"/>
<depend name="${NME_JPEG_SRC}jmemsys.h"/>
<depend name="${NME_JPEG_SRC}jmorecfg.h"/>
<depend name="${NME_JPEG_SRC}jpegint.h"/>
<depend name="${NME_JPEG_SRC}jinclude.h"/>
<depend name="${NME_JPEG_SRC}jerror.h"/>
<depend name="${NME_JPEG_SRC}jdct.h"/>
</files>


<files id="native-toolkit-jpeg-16" tags="">
<compilerflag value="-DBITS_IN_JSAMPLE=16" />
<depend files="native-toolkit-jpeg-depends-int"/>
<compilerflag value="-I${NME_JPEG}" />
<compilerflag value="-I${NME_JPEG}/src" />
<compilerflag value="-I${NME_JPEG}/.." />
<compilerflag value="-DWITH_SIMD=1" if="NME_SIMD_D16" unless="JPEG_SUPPRESS_SIMD" />
<objprefix value="s16_" />
<file name="${NME_JPEG}jcapistd.c" />
<file name="${NME_JPEG}jccolor.c" />
<file name="${NME_JPEG}jcdiffct.c" />
<file name="${NME_JPEG}jclossls.c" />
<file name="${NME_JPEG}jcmainct.c" />
<file name="${NME_JPEG}jcprepct.c" />
<file name="${NME_JPEG}jcsample.c" />
<file name="${NME_JPEG}jdapistd.c" />
<file name="${NME_JPEG}jdcolor.c" />
<file name="${NME_JPEG}jddiffct.c" />
<file name="${NME_JPEG}jdlossls.c" />
<file name="${NME_JPEG}jdmainct.c" />
<file name="${NME_JPEG}jdpostct.c" />
<file name="${NME_JPEG}jdsample.c" />
<file name="${NME_JPEG}jutils.c" />
<file name="${NME_JPEG_SRC}jcapistd.c" />
<file name="${NME_JPEG_SRC}jccolor.c" />
<file name="${NME_JPEG_SRC}jcdiffct.c" />
<file name="${NME_JPEG_SRC}jclossls.c" />
<file name="${NME_JPEG_SRC}jcmainct.c" />
<file name="${NME_JPEG_SRC}jcprepct.c" />
<file name="${NME_JPEG_SRC}jcsample.c" />
<file name="${NME_JPEG_SRC}jdapistd.c" />
<file name="${NME_JPEG_SRC}jdcolor.c" />
<file name="${NME_JPEG_SRC}jddiffct.c" />
<file name="${NME_JPEG_SRC}jdlossls.c" />
<file name="${NME_JPEG_SRC}jdmainct.c" />
<file name="${NME_JPEG_SRC}jdpostct.c" />
<file name="${NME_JPEG_SRC}jdsample.c" />
<file name="${NME_JPEG_SRC}jutils.c" />
</files>


Expand All @@ -57,39 +58,39 @@
<compilerflag value="-DWITH_SIMD=1" if="NME_SIMD_D_12" unless="JPEG_SUPPRESS_SIMD" />
<compilerflag value="-DBITS_IN_JSAMPLE=12" />
<depend files="native-toolkit-jpeg-depends-int"/>
<compilerflag value="-I${NME_JPEG}" />
<compilerflag value="-I${NME_JPEG_SRC}" />
<compilerflag value="-I${NME_JPEG}/.." />
<objprefix value="s12_" />

<file name="${NME_JPEG}jcapistd.c" />
<file name="${NME_JPEG}jccolor.c" />
<file name="${NME_JPEG}jcdiffct.c" />
<file name="${NME_JPEG}jclossls.c" />
<file name="${NME_JPEG}jcmainct.c" />
<file name="${NME_JPEG}jcprepct.c" />
<file name="${NME_JPEG}jcsample.c" />
<file name="${NME_JPEG}jdapistd.c" />
<file name="${NME_JPEG}jdcolor.c" />
<file name="${NME_JPEG}jddiffct.c" />
<file name="${NME_JPEG}jdlossls.c" />
<file name="${NME_JPEG}jdmainct.c" />
<file name="${NME_JPEG}jdpostct.c" />
<file name="${NME_JPEG}jdsample.c" />
<file name="${NME_JPEG}jutils.c" />

<file name="${NME_JPEG}jccoefct.c" />
<file name="${NME_JPEG}jcdctmgr.c" />
<file name="${NME_JPEG}jdcoefct.c" />
<file name="${NME_JPEG}jddctmgr.c" />
<file name="${NME_JPEG}jdmerge.c" />
<file name="${NME_JPEG}jfdctfst.c" />
<file name="${NME_JPEG}jfdctint.c" />
<file name="${NME_JPEG}jidctflt.c" />
<file name="${NME_JPEG}jidctfst.c" />
<file name="${NME_JPEG}jidctint.c" />
<file name="${NME_JPEG}jidctred.c" />
<file name="${NME_JPEG}jquant1.c" />
<file name="${NME_JPEG}jquant2.c" />
<file name="${NME_JPEG_SRC}jcapistd.c" />
<file name="${NME_JPEG_SRC}jccolor.c" />
<file name="${NME_JPEG_SRC}jcdiffct.c" />
<file name="${NME_JPEG_SRC}jclossls.c" />
<file name="${NME_JPEG_SRC}jcmainct.c" />
<file name="${NME_JPEG_SRC}jcprepct.c" />
<file name="${NME_JPEG_SRC}jcsample.c" />
<file name="${NME_JPEG_SRC}jdapistd.c" />
<file name="${NME_JPEG_SRC}jdcolor.c" />
<file name="${NME_JPEG_SRC}jddiffct.c" />
<file name="${NME_JPEG_SRC}jdlossls.c" />
<file name="${NME_JPEG_SRC}jdmainct.c" />
<file name="${NME_JPEG_SRC}jdpostct.c" />
<file name="${NME_JPEG_SRC}jdsample.c" />
<file name="${NME_JPEG_SRC}jutils.c" />

<file name="${NME_JPEG_SRC}jccoefct.c" />
<file name="${NME_JPEG_SRC}jcdctmgr.c" />
<file name="${NME_JPEG_SRC}jdcoefct.c" />
<file name="${NME_JPEG_SRC}jddctmgr.c" />
<file name="${NME_JPEG_SRC}jdmerge.c" />
<file name="${NME_JPEG_SRC}jfdctfst.c" />
<file name="${NME_JPEG_SRC}jfdctint.c" />
<file name="${NME_JPEG_SRC}jidctflt.c" />
<file name="${NME_JPEG_SRC}jidctfst.c" />
<file name="${NME_JPEG_SRC}jidctint.c" />
<file name="${NME_JPEG_SRC}jidctred.c" />
<file name="${NME_JPEG_SRC}jquant1.c" />
<file name="${NME_JPEG_SRC}jquant2.c" />
</files>


Expand All @@ -99,72 +100,72 @@

<compilerflag value="-DWITH_SIMD=1" if="NME_SIMD_D" unless="JPEG_SUPPRESS_SIMD" />
<depend files="native-toolkit-jpeg-depends-int"/>
<compilerflag value="-I${NME_JPEG}" />
<compilerflag value="-I${NME_JPEG}/.." />
<compilerflag value="-I${NME_JPEG_SRC}" />
<compilerflag value="-I${NME_JPEG}.." />

<files id="jpeg-sample12" />
<files id="jpeg-sample16" />

<file name="${NME_JPEG}jccoefct.c" />
<file name="${NME_JPEG}jcdctmgr.c" />
<file name="${NME_JPEG}jdcoefct.c" />
<file name="${NME_JPEG}jddctmgr.c" />
<file name="${NME_JPEG}jdmerge.c" />
<file name="${NME_JPEG}jfdctfst.c" />
<file name="${NME_JPEG}jfdctint.c" />
<file name="${NME_JPEG}jidctflt.c" />
<file name="${NME_JPEG}jidctfst.c" />
<file name="${NME_JPEG}jidctint.c" />
<file name="${NME_JPEG}jidctred.c" />
<file name="${NME_JPEG}jquant1.c" />
<file name="${NME_JPEG}jquant2.c" />

<file name="${NME_JPEG}jcapistd.c" />
<file name="${NME_JPEG}jccolor.c" />
<file name="${NME_JPEG}jcdiffct.c" />
<file name="${NME_JPEG}jclossls.c" />
<file name="${NME_JPEG}jcmainct.c" />
<file name="${NME_JPEG}jcprepct.c" />
<file name="${NME_JPEG}jcsample.c" />
<file name="${NME_JPEG}jdapistd.c" />
<file name="${NME_JPEG}jdcolor.c" />
<file name="${NME_JPEG}jddiffct.c" />
<file name="${NME_JPEG}jdlossls.c" />
<file name="${NME_JPEG}jdmainct.c" />
<file name="${NME_JPEG}jdpostct.c" />
<file name="${NME_JPEG}jdsample.c" />
<file name="${NME_JPEG}jutils.c" />

<file name="${NME_JPEG}jcapimin.c" />
<file name="${NME_JPEG}jchuff.c" />
<file name="${NME_JPEG}jcicc.c" />
<file name="${NME_JPEG}jcinit.c" />
<file name="${NME_JPEG}jclhuff.c" />
<file name="${NME_JPEG}jcmarker.c" />
<file name="${NME_JPEG}jcmaster.c" />
<file name="${NME_JPEG}jcomapi.c" />
<file name="${NME_JPEG}jcparam.c" />
<file name="${NME_JPEG}jcphuff.c" />
<file name="${NME_JPEG}jctrans.c" />
<file name="${NME_JPEG}jdapimin.c" />
<file name="${NME_JPEG}jdatadst.c" />
<file name="${NME_JPEG}jdatasrc.c" />
<file name="${NME_JPEG}jdhuff.c" />
<file name="${NME_JPEG}jdicc.c" />
<file name="${NME_JPEG}jdinput.c" />
<file name="${NME_JPEG}jdlhuff.c" />
<file name="${NME_JPEG}jdmarker.c" />
<file name="${NME_JPEG}jdmaster.c" />
<file name="${NME_JPEG}jdphuff.c" />
<file name="${NME_JPEG}jdtrans.c" />
<file name="${NME_JPEG}jerror.c" />
<file name="${NME_JPEG}jfdctflt.c" />
<file name="${NME_JPEG}jmemmgr.c" />
<file name="${NME_JPEG}jmemnobs.c" />
<file name="${NME_JPEG}jpeg_nbits.c" />
<file name="${NME_JPEG}jaricom.c" />
<file name="${NME_JPEG}jcarith.c" />
<file name="${NME_JPEG}jdarith.c" />
<file name="${NME_JPEG_SRC}jccoefct.c" />
<file name="${NME_JPEG_SRC}jcdctmgr.c" />
<file name="${NME_JPEG_SRC}jdcoefct.c" />
<file name="${NME_JPEG_SRC}jddctmgr.c" />
<file name="${NME_JPEG_SRC}jdmerge.c" />
<file name="${NME_JPEG_SRC}jfdctfst.c" />
<file name="${NME_JPEG_SRC}jfdctint.c" />
<file name="${NME_JPEG_SRC}jidctflt.c" />
<file name="${NME_JPEG_SRC}jidctfst.c" />
<file name="${NME_JPEG_SRC}jidctint.c" />
<file name="${NME_JPEG_SRC}jidctred.c" />
<file name="${NME_JPEG_SRC}jquant1.c" />
<file name="${NME_JPEG_SRC}jquant2.c" />

<file name="${NME_JPEG_SRC}jcapistd.c" />
<file name="${NME_JPEG_SRC}jccolor.c" />
<file name="${NME_JPEG_SRC}jcdiffct.c" />
<file name="${NME_JPEG_SRC}jclossls.c" />
<file name="${NME_JPEG_SRC}jcmainct.c" />
<file name="${NME_JPEG_SRC}jcprepct.c" />
<file name="${NME_JPEG_SRC}jcsample.c" />
<file name="${NME_JPEG_SRC}jdapistd.c" />
<file name="${NME_JPEG_SRC}jdcolor.c" />
<file name="${NME_JPEG_SRC}jddiffct.c" />
<file name="${NME_JPEG_SRC}jdlossls.c" />
<file name="${NME_JPEG_SRC}jdmainct.c" />
<file name="${NME_JPEG_SRC}jdpostct.c" />
<file name="${NME_JPEG_SRC}jdsample.c" />
<file name="${NME_JPEG_SRC}jutils.c" />

<file name="${NME_JPEG_SRC}jcapimin.c" />
<file name="${NME_JPEG_SRC}jchuff.c" />
<file name="${NME_JPEG_SRC}jcicc.c" />
<file name="${NME_JPEG_SRC}jcinit.c" />
<file name="${NME_JPEG_SRC}jclhuff.c" />
<file name="${NME_JPEG_SRC}jcmarker.c" />
<file name="${NME_JPEG_SRC}jcmaster.c" />
<file name="${NME_JPEG_SRC}jcomapi.c" />
<file name="${NME_JPEG_SRC}jcparam.c" />
<file name="${NME_JPEG_SRC}jcphuff.c" />
<file name="${NME_JPEG_SRC}jctrans.c" />
<file name="${NME_JPEG_SRC}jdapimin.c" />
<file name="${NME_JPEG_SRC}jdatadst.c" />
<file name="${NME_JPEG_SRC}jdatasrc.c" />
<file name="${NME_JPEG_SRC}jdhuff.c" />
<file name="${NME_JPEG_SRC}jdicc.c" />
<file name="${NME_JPEG_SRC}jdinput.c" />
<file name="${NME_JPEG_SRC}jdlhuff.c" />
<file name="${NME_JPEG_SRC}jdmarker.c" />
<file name="${NME_JPEG_SRC}jdmaster.c" />
<file name="${NME_JPEG_SRC}jdphuff.c" />
<file name="${NME_JPEG_SRC}jdtrans.c" />
<file name="${NME_JPEG_SRC}jerror.c" />
<file name="${NME_JPEG_SRC}jfdctflt.c" />
<file name="${NME_JPEG_SRC}jmemmgr.c" />
<file name="${NME_JPEG_SRC}jmemnobs.c" />
<file name="${NME_JPEG_SRC}jpeg_nbits.c" />
<file name="${NME_JPEG_SRC}jaricom.c" />
<file name="${NME_JPEG_SRC}jcarith.c" />
<file name="${NME_JPEG_SRC}jdarith.c" />


<section if="NME_SIMD_ARM64 || NME_SIMD_ARM7" >
Expand Down Expand Up @@ -257,12 +258,12 @@

<files id="jpeg-test-main" tags="">
<depend files="native-toolkit-jpeg-depends-int"/>
<compilerflag value="-I${NME_JPEG}" />
<compilerflag value="-I${NME_JPEG}/.." />
<compilerflag value="-I${NME_JPEG_SRC}" />
<compilerflag value="-I${NME_JPEG}.." />

<file name="${NME_JPEG}/cjpeg.c" />
<file name="${NME_JPEG}/cdjpeg.c" />
<file name="${NME_JPEG}/rdswitch.c" />
<file name="${NME_JPEG_SRC}/cjpeg.c" />
<file name="${NME_JPEG_SRC}/cdjpeg.c" />
<file name="${NME_JPEG_SRC}/rdswitch.c" />
</files>

<target id="default" tool="linker" toolid="exe" output="out" if="BUILD_TEST" >
Expand Down
2 changes: 1 addition & 1 deletion project/toolkit/jpeg/libjpeg-turbo
Submodule libjpeg-turbo updated 442 files
2 changes: 1 addition & 1 deletion project/toolkit/png/libpng
Submodule libpng updated 199 files
2 changes: 1 addition & 1 deletion project/toolkit/sdl-mixer/SDL_mixer
Submodule SDL_mixer updated 113 files
2 changes: 1 addition & 1 deletion project/toolkit/sdl/SDL
Submodule SDL updated 397 files
6 changes: 3 additions & 3 deletions project/toolkit/sdl/files.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
<file name="${NME_LIBSDL}src/audio/SDL_wave.c" />

<file name="${NME_LIBSDL}src/cpuinfo/SDL_cpuinfo.c" />
<file name="${NME_LIBSDL}src/file/SDL_iostream.c" />
<file name="${NME_LIBSDL}src/file/SDL_asyncio.c" />
<file name="${NME_LIBSDL}src/io/SDL_iostream.c" />
<file name="${NME_LIBSDL}src/io/SDL_asyncio.c" />
<file name="${NME_LIBSDL}src/dynapi/SDL_dynapi.c" />
<file name="${NME_LIBSDL}src/events/SDL_clipboardevents.c" />
<file name="${NME_LIBSDL}src/events/SDL_displayevents.c" />
Expand Down Expand Up @@ -270,7 +270,7 @@
<file name="${NME_LIBSDL}src/dialog/SDL_dialog.c" />
<file name="${NME_LIBSDL}src/process/SDL_process.c" />
<file name="${NME_LIBSDL}src/tray/SDL_tray_utils.c" />
<file name="${NME_LIBSDL}/src/file/generic/SDL_asyncio_generic.c" />
<file name="${NME_LIBSDL}/src/io/generic/SDL_asyncio_generic.c" />


<section unless="windows">
Expand Down

0 comments on commit a5d3ac3

Please sign in to comment.