s/sok-text/text/, s/sok-sdk/sok/, mv src/{text,levels}/levels.[hc], and remove some extraneous headers

1 files changed, 14 insertions, 13 deletions

diff --git a/meson.build b/meson.build
index dccfe9a..d9dca9d 100644
--- a/meson.build
+++ b/meson.build
@@ -4,25 +4,26 @@ project('sok', 'c', default_options: ['c_std=c11'])
 cc = meson.get_compiler('c')
 libm = cc.find_library('m', required: true)
 
+# core source (shared across all applications)
 sources = [
-  'src/libsok/sok-level-parser.c',
-  'src/libsok/sok-ctx.c',
-  'src/libsok/sok-ctx-hash.c',
-  'src/libsok/sok-cache.c',
-  'src/libsok/sok-solve.c',
+  'src/core/sok-level-parser.c',
+  'src/core/sok-ctx.c',
+  'src/core/sok-ctx-hash.c',
+  'src/core/sok-cache.c',
+  'src/core/sok-solve.c',
 ]
 
-# text exe
-executable('sok-text', sources + [
+# text UI
+executable('text', sources + [
+  'src/levels/levels.c',
   'src/text/main.c',
-  'src/text/levels.c',
   'src/text/action.c',
   'src/text/draw.c',
 ], dependencies: [])
 
-# sdl exe
-executable('sok-sdl', sources + [
-  'src/text/levels.c',
+# sdl (main) exe
+executable('sok', sources + [
+  'src/levels/levels.c',
   'src/sdl/warp-buf.c',
   'src/sdl/color.c',
   'src/sdl/action.c',
@@ -41,7 +42,7 @@ executable('sok-sdl', sources + [
 ])
 
 # sprite-packer exe
-executable('sprite-packer', sources + [
+executable('sprite-packer', [
   'src/sprite-packer/main.c',
 ], dependencies: [
   dependency('SDL2'),
@@ -50,7 +51,7 @@ executable('sprite-packer', sources + [
 
 # solver
 solve = executable('solve', sources + [
-  'src/text/levels.c',
+  'src/levels/levels.c',
   'src/solve/main.c',
 ], dependencies: [])