static link physfs

This commit is contained in:
2025-01-28 11:16:00 -06:00
parent de1c9a1485
commit e6aac69358
4 changed files with 36 additions and 6 deletions

View File

@@ -9,6 +9,27 @@ if not get_option('editor')
add_project_arguments('-DNEDITOR', language:'c') add_project_arguments('-DNEDITOR', language:'c')
endif endif
# Grab the nearest tag (e.g., "0.6.1")
git_tag_cmd = run_command('git', 'describe', '--tags', '--abbrev=0', check: false)
prosperon_version = 'unknown'
if git_tag_cmd.returncode() == 0
prosperon_version = git_tag_cmd.stdout().strip()
endif
# Grab short commit hash (e.g., "de1c9a1")
git_commit_cmd = run_command('git', 'rev-parse', '--short', 'HEAD', check: false)
prosperon_commit = 'unknown'
if git_commit_cmd.returncode() == 0
prosperon_commit = git_commit_cmd.stdout().strip()
endif
# Important: pass the definitions without double-escaping quotes
add_project_arguments(
'-DPROSPERON_VERSION="' + prosperon_version + '"',
'-DPROSPERON_COMMIT="' + prosperon_commit + '"',
language : 'c'
)
add_project_arguments('-Wno-incompatible-pointer-types', language: 'c') add_project_arguments('-Wno-incompatible-pointer-types', language: 'c')
add_project_arguments('-Wno-narrowing', language: 'cpp') add_project_arguments('-Wno-narrowing', language: 'cpp')
add_project_arguments('-Wno-missing-braces', language:'c') add_project_arguments('-Wno-missing-braces', language:'c')
@@ -26,7 +47,7 @@ if host_machine.system() == 'darwin'
endif endif
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
deps += dependency('sdl3') deps += dependency('sdl3', required:true)
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
deps += dependency('appleframeworks', modules: 'accelerate') deps += dependency('appleframeworks', modules: 'accelerate')
@@ -73,7 +94,7 @@ deps += dependency('qjs-layout',static:true)
deps += dependency('qjs-nota',static:true) deps += dependency('qjs-nota',static:true)
deps += dependency('qjs-miniz') deps += dependency('qjs-miniz')
deps += dependency('qjs-soloud',static:true) deps += dependency('qjs-soloud',static:true)
deps += dependency('physfs') deps += dependency('physfs', static:true)
#deps += dependency('opencv4') #deps += dependency('opencv4')
#deps += cc.find_library('opencv') #deps += cc.find_library('opencv')

View File

@@ -497,9 +497,5 @@ var search = use('search')
actor[UNDERLINGS] = new Set() actor[UNDERLINGS] = new Set()
var log = use('log')
log.enable("dbg", {console:true})
log.dbg("TEST")
globalThis.mixin("color"); globalThis.mixin("color");
globalThis.mixin("std") globalThis.mixin("std")

View File

@@ -1,5 +1,6 @@
var profile = use('profile') var profile = use('profile')
var io = use('io') var io = use('io')
var util = use('util')
var dumpfolder = ".prosperon"; var dumpfolder = ".prosperon";
@@ -307,6 +308,7 @@ Cmdline.print_order = function (fn) {
Cmdline.register_order( Cmdline.register_order(
"help", "help",
function (order) { function (order) {
if (!util.isEmpty(order)) { if (!util.isEmpty(order)) {
var orfn = Cmdline.orders[order]; var orfn = Cmdline.orders[order];

View File

@@ -7209,7 +7209,18 @@ JSC_SSCALL(os_trimchr,
ret = JS_NewStringLen(js, start, end-start+1); ret = JS_NewStringLen(js, start, end-start+1);
) )
JSC_CCALL(os_version,
return JS_NewString(js,PROSPERON_VERSION);
)
JSC_CCALL(os_commit,
return JS_NewString(js,PROSPERON_COMMIT);
)
static const JSCFunctionListEntry js_os_funcs[] = { static const JSCFunctionListEntry js_os_funcs[] = {
MIST_FUNC_DEF(os, version, 0),
MIST_FUNC_DEF(os, commit, 0),
MIST_FUNC_DEF(os, engine_start, 1), MIST_FUNC_DEF(os, engine_start, 1),
MIST_FUNC_DEF(os, engine_input, 1), MIST_FUNC_DEF(os, engine_input, 1),
MIST_FUNC_DEF(os, turbulence, 4), MIST_FUNC_DEF(os, turbulence, 4),