diff --git a/meson.build b/meson.build index 4021472..b5b34e3 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ if (libtype != 'static') endif add_global_arguments('-DCONFIG_BIGNUM', language : 'c') -add_global_arguments('-DCP_USE_DOUBLES=0', language : 'c') +add_global_arguments('-DCP_USE_DOUBLES=0', language : 'c') # option for chipmunk physics add_project_arguments('-Wno-implicit-function-declaration', language: 'c') add_project_arguments('-Wno-incompatible-function-pointer-types', language: 'c') @@ -38,14 +38,15 @@ if host_machine.system() == 'windows' endforeach endif -quickjs = dependency('quickjs', fallback:['quickjs', 'quickjs_dep'], static:true) -enet = dependency('qjs-enet', fallback:['qjs-enet', 'enet_dep'],static:true) -layout = dependency('qjs-layout', fallback:['qjs-layout', 'qjs_layout_dep'],static:true) -nota = dependency('qjs-nota', fallback:['qjs-nota', 'dep'],static:true) -steam = dependency('qjs-steam', fallback:['qjs-steam', 'dep'],static:true) -chipmunk2d = dependency('qjs-chipmunk2d', fallback:['qjs-chipmunk2d', 'qjs_chipmunk2d_dep'],static:true) -miniz = dependency('qjs-miniz', fallback:['qjs-miniz', 'qjs_miniz_dep'],static:true) -soloud = dependency('qjs-soloud', fallback:['qjs-soloud', 'qjs_soloud_dep'],static:true) +deps = [] +deps += dependency('quickjs', static:true) +deps += dependency('qjs-enet',static:true) +deps += dependency('qjs-layout',static:true) +deps += dependency('qjs-nota',static:true) +#steam = dependency('qjs-steam',static:true) +deps += dependency('qjs-chipmunk',static:true) +deps += dependency('qjs-miniz',static:true) +deps += dependency('qjs-soloud',static:true) sources = [] src = ['anim.c', 'config.c', 'datastream.c','font.c','gameobject.c','qjs_imgui.cpp','HandmadeMath.c','input.c', 'jsffi.c','log.c','miniz.c','model.c','render.c','script.c','resources.c','simplex.c','spline.c','texture.c', 'timer.c', 'transform.c','warp.c','window.c','yugine.c'] @@ -91,6 +92,6 @@ core = custom_target('core_bundle', ) prosperon = executable('prosperon', sources, - dependencies: deps + [quickjs, enet, layout, nota, steam, chipmunk2d, miniz, soloud], + dependencies: deps + [quickjs, enet, layout, nota, chipmunk2d, miniz, soloud], include_directories: includers ) diff --git a/subprojects/chipmunk.wrap b/subprojects/chipmunk.wrap new file mode 100644 index 0000000..322137b --- /dev/null +++ b/subprojects/chipmunk.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = Chipmunk2D-Chipmunk-7.0.3 +source_url = https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-7.0.3.tar.gz +source_filename = Chipmunk2D-Chipmunk-7.0.3.tar.gz +source_hash = 1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a +patch_filename = chipmunk_7.0.3-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/chipmunk_7.0.3-1/get_patch +patch_hash = 90e5e1be7712812cd303974910c37e7c4f2d2c8060312521b3a7995daa54f66a +wrapdb_version = 7.0.3-1 + +[provide] +chipmunk = chipmunk_dep + diff --git a/subprojects/enet.wrap b/subprojects/enet.wrap new file mode 100644 index 0000000..cd368ed --- /dev/null +++ b/subprojects/enet.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = enet-1.3.17 +source_url = http://enet.bespin.org/download/enet-1.3.17.tar.gz +source_filename = enet-1.3.17.tar.gz +source_hash = a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc +patch_filename = enet_1.3.17-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/enet_1.3.17-2/get_patch +patch_hash = ecafa5c354d3b512c0296121d6be6f39b8a99c286be375f60e94fe097ac401c2 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/enet_1.3.17-2/enet-1.3.17.tar.gz +wrapdb_version = 1.3.17-2 + +[provide] +enet = enet_dep diff --git a/subprojects/miniz.wrap b/subprojects/miniz.wrap new file mode 100644 index 0000000..41aaad6 --- /dev/null +++ b/subprojects/miniz.wrap @@ -0,0 +1,14 @@ +[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 diff --git a/subprojects/qjs-chipmunk2d.wrap b/subprojects/qjs-chipmunk2d.wrap new file mode 100644 index 0000000..0ce9987 --- /dev/null +++ b/subprojects/qjs-chipmunk2d.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/qjs-chipmunk2d.git +revision = head +depth = 1 + +[provide] +qjs-chipmunk = qjs_chipmunk_dep diff --git a/subprojects/qjs-enet.wrap b/subprojects/qjs-enet.wrap new file mode 100644 index 0000000..28f4d79 --- /dev/null +++ b/subprojects/qjs-enet.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/qjs-enet.git +revision = head +depth = 1 + +[provide] +qjs-enet = qjs_enet_dep diff --git a/subprojects/qjs-layout.wrap b/subprojects/qjs-layout.wrap new file mode 100644 index 0000000..9bccb36 --- /dev/null +++ b/subprojects/qjs-layout.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/qjs-layout.git +revision = head +depth = 1 + +[provide] +qjs-layout = qjs_layout_dep diff --git a/subprojects/qjs-miniz.wrap b/subprojects/qjs-miniz.wrap new file mode 100644 index 0000000..104434b --- /dev/null +++ b/subprojects/qjs-miniz.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/qjs-miniz.git +revision = head +depth = 1 + +[provide] +qjs-miniz = qjs_miniz_dep diff --git a/subprojects/qjs-nota.wrap b/subprojects/qjs-nota.wrap new file mode 100644 index 0000000..8d0d7d0 --- /dev/null +++ b/subprojects/qjs-nota.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/cnota.git +revision = head +depth = 1 + +[provide] +qjs-nota = qjs_nota_dep diff --git a/subprojects/qjs-soloud.wrap b/subprojects/qjs-soloud.wrap new file mode 100644 index 0000000..33f2381 --- /dev/null +++ b/subprojects/qjs-soloud.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/qjs-soloud.git +revision = head +depth = 1 + +[provide] +qjs-soloud = qjs_soloud_dep diff --git a/subprojects/qjs-steam.wrap b/subprojects/qjs-steam.wrap new file mode 100644 index 0000000..7a0b272 --- /dev/null +++ b/subprojects/qjs-steam.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/qjs-steam.git +revision = head +depth = 1 + +[provide] +qjs-steam = qjs_steam_dep diff --git a/subprojects/quickjs.wrap b/subprojects/quickjs.wrap new file mode 100644 index 0000000..d54227f --- /dev/null +++ b/subprojects/quickjs.wrap @@ -0,0 +1,8 @@ +[wrap-git] +url = https://github.com/johnalanbrook/quickjs.git +revision = head +depth = 1 + +[provide] +quickjs = quickjs_dep + diff --git a/subprojects/soloud.wrap b/subprojects/soloud.wrap new file mode 100644 index 0000000..92ad856 --- /dev/null +++ b/subprojects/soloud.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/johnalanbrook/soloud.git +revision = head +depth = 1 + +[provide] +soloud = soloud_dep