From 97fa6cd6f4c0fb252ba153349383363a0e7e36af Mon Sep 17 00:00:00 2001 From: Robear Selwans Date: Fri, 21 May 2021 19:16:32 +0200 Subject: [PATCH] Added specialization Signed-off-by: Robear Selwans --- .gitignore | 2 ++ meson.build | 8 ++++---- meta/evmod.configvars | 2 -- meta/evmod.events | 3 --- meta/evmod.namespaces | 5 ----- meta/evmod.types | 2 -- src/mod.c | 14 ++++++++++++++ src/template.c | 43 ------------------------------------------- 8 files changed, 20 insertions(+), 59 deletions(-) create mode 100644 .gitignore create mode 100644 src/mod.c delete mode 100644 src/template.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..181ea9e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +tags* +import diff --git a/meson.build b/meson.build index 492bf8b..cc49880 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('template', 'c', +project('evol-mod-assetmanager', 'c', version : '0.1', default_options : ['warning_level=3', 'c_std=c11']) @@ -8,7 +8,7 @@ run_command( 'python3', meson.source_root() + '/subprojects/evol/buildscripts/co subdir('import') mod_src = [ - 'src/template.c', + 'src/mod.c', ] mod_incdir = [ @@ -20,7 +20,7 @@ mod_deps = [ ] module = shared_module( - 'template', mod_src, + 'evmodassetmanager', mod_src, include_directories: mod_incdir, dependencies: mod_deps, ) @@ -29,4 +29,4 @@ mod_dep = declare_dependency( include_directories: mod_incdir, ) -meson.override_dependency('evmod_template', mod_dep) +meson.override_dependency('evmod_assets', mod_dep) diff --git a/meta/evmod.configvars b/meta/evmod.configvars index c2ed9d8..e69de29 100644 --- a/meta/evmod.configvars +++ b/meta/evmod.configvars @@ -1,2 +0,0 @@ -EV_CONFIG_VAR(template_var1, I32, 0) -EV_CONFIG_VAR(template_var2, SDS, "Default") diff --git a/meta/evmod.events b/meta/evmod.events index 83fb2f2..e69de29 100644 --- a/meta/evmod.events +++ b/meta/evmod.events @@ -1,3 +0,0 @@ -PRIMARY(PrimaryEvent, { U32 dummy_primary; }) - -SECONDARY(PrimaryEvent, SecondaryEvent, { U32 dummy_secondary; }) diff --git a/meta/evmod.namespaces b/meta/evmod.namespaces index 9453ebd..e69de29 100644 --- a/meta/evmod.namespaces +++ b/meta/evmod.namespaces @@ -1,5 +0,0 @@ -EV_NS_DEF_BEGIN(Namespace1) - -EV_NS_DEF_FN(U32, update, (F32, deltaTime)) - -EV_NS_DEF_END(Namespace1) \ No newline at end of file diff --git a/meta/evmod.types b/meta/evmod.types index 8ae62e8..e69de29 100644 --- a/meta/evmod.types +++ b/meta/evmod.types @@ -1,2 +0,0 @@ -TYPE(TypeA, { I32 member1, F32 member2; }) -TYPE(TypeB, { PTR memberX, STR memberY; }) diff --git a/src/mod.c b/src/mod.c new file mode 100644 index 0000000..51eab12 --- /dev/null +++ b/src/mod.c @@ -0,0 +1,14 @@ +#define EV_MODULE_DEFINE +#include + +EV_CONSTRUCTOR +{ +} + +EV_DESTRUCTOR +{ +} + +EV_BINDINGS +{ +} diff --git a/src/template.c b/src/template.c deleted file mode 100644 index aaad5c9..0000000 --- a/src/template.c +++ /dev/null @@ -1,43 +0,0 @@ -#define EV_MODULE_DEFINE -#include - -#include - -EV_CONSTRUCTOR -{ - printf("Loaded template module\n"); -} - -U32 -update( - F32 deltaTime) -{ - EV_UNUSED_PARAM(deltaTime); - return 0; -} - -EV_DESTRUCTOR -{ - printf("Unloaded template module\n"); -} - -EVMODAPI bool -export_and( - bool x, - bool y) -{ - return x & y; -} - -EVMODAPI bool -export_or( - bool x, - bool y) -{ - return x | y; -} - -EV_BINDINGS -{ - EV_NS_BIND_FN(Namespace1, update, update); -}