update miniz to 3.1

meson.build

@@ -41,22 +41,6 @@ deps = []
 if host_machine.system() == 'darwin'
   add_project_arguments('-x', 'objective-c', language: 'c')
   fworks = [
-    'foundation',
-    'metal',
-    'audiotoolbox',
-    'metalkit',
-    'avfoundation',
-    'quartzcore',
-    'cocoa',
-    'coreaudio',
-    'coremedia',
-    'gamecontroller',
-    'forcefeedback',
-    'iokit',
-    'corefoundation',
-    'corehaptics',
-    'carbon',
-    'uniformtypeidentifiers'
   ]
   foreach fkit : fworks
     deps += dependency('appleframeworks', modules: fkit)
@@ -86,16 +70,6 @@ if host_machine.system() == 'windows'
   add_project_link_arguments('-static-libgcc', '-static-libstdc++', language: ['c', 'cpp'])
 endif
 
-miniz_dep = dependency('miniz', static: true, required: false)
-if not miniz_dep.found()
-  message('⚙  System miniz not found, building subproject...')
-  deps += dependency('miniz', static:true)
-else
-  deps += miniz_dep
-endif
-
-deps += dependency('threads')
-
 # Try to find system-installed curl first
 curl_dep = dependency('libcurl', static: true, required: false)
 if not curl_dep.found()
@@ -152,6 +126,7 @@ src += [        # core
   'wildmatch.c',
   'qjs_actor.c',
   'qjs_wota.c',
+  'miniz.c'
 ]
 
 if get_option('single_threaded')
@@ -173,7 +148,6 @@ scripts = [
   'utf8.c',
   'kim.c',
   'time.c',
-  'miniz.c',
   'nota.c',
   'debug.c',
   'os.c',
@@ -182,6 +156,7 @@ scripts = [
   'http.c',
   'enet.c',
   'wildstar.c',
+  'miniz.c',
 ]
 
 foreach file: scripts

scripts/compile.ce

@@ -93,7 +93,7 @@ if (config.compilation)
 if (config.compilation[os.platform()])
     link_flags += ` ${config.compilation[os.platform()].LDFLAGS} `
 
-var link_cmd = 'cc ' + link_flags + ' ' + objects.join(' ') + ' -lcell -o ' + lib_name
+var link_cmd = 'cc ' + link_flags + ' ' + objects.join(' ') + ' -lcell -lc -lc++ -o ' + lib_name
 var ret = os.system(link_cmd)
 
 if (ret != 0) {

subprojects/miniz.wrap

@@ -1,14 +0,0 @@
-[wrap-file]
-directory = miniz-3.0.2
-lead_directory_missing = true
-source_url = https://github.com/richgel999/miniz/releases/download/3.0.2/miniz-3.0.2.zip
-source_filename = miniz-3.0.2.zip
-source_hash = ada38db0b703a56d3dd6d57bf84a9c5d664921d870d8fea4db153979fb5332c5
-patch_filename = miniz_3.0.2-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/miniz_3.0.2-1/get_patch
-patch_hash = 3faf465a60b2b5625b5f61fd15bd27544a69e7ce96ed546128f33f37c3e516bb
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/miniz_3.0.2-1/miniz-3.0.2.zip
-wrapdb_version = 3.0.2-1
-
-[provide]
-miniz = miniz_dep

subprojects/sdl3.wrap

@@ -1,4 +0,0 @@
-[wrap-git]
-url = https://github.com/libsdl-org/SDL.git
-revision = release-3.2.10
-depth = 1