microui-based debugger

.github/workflows/build-test.yml

@@ -14,9 +14,11 @@ jobs:
       with: 
         submodules: recursive
     - name: set up packages
-      run: sudo apt install gcc libsdl2-dev libxxhash-dev
+      run: sudo apt install meson ninja-build gcc libsdl2-dev libxxhash-dev
     - name: build release
-      run: ./build.sh
+      run: |
+        meson setup build
+        meson compile -C build
     - name: upload build
       uses: actions/upload-artifact@v3
       with:
@@ -37,14 +39,16 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         release: false
-        install: git mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 zlib mingw-w64-x86_64-xxhash
+        install: mingw-w64-x86_64-meson mingw-w64-x86_64-pkgconf git mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 zlib mingw-w64-x86_64-xxhash mingw-w64-x86_64-freetype
     - run: git config --global core.autocrlf input
       shell: bash
     - uses: actions/checkout@v3
       with: 
         submodules: recursive
     - name: build release
-      run: ./build.sh -p win32
+      run: |
+        meson setup build
+        meson compile -C build
     - name: upload build
       uses: actions/upload-artifact@v3
       with:

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "ayumi"]
 	path = ayumi
 	url = https://github.com/wermipls/ayumi
+[submodule "microui"]
+	path = microui
+	url = https://github.com/wermipls/microui

meson.build

@@ -0,0 +1,96 @@
+project('sleepdart', 'c', default_options: ['buildtype=release'])
+
+release_args = ['-ffast-math', '-flto', '-fwhole-program']
+if get_option('buildtype') == 'release'
+  add_project_arguments(release_args, language: 'c')
+  add_project_link_arguments(release_args, language: 'c')
+endif
+
+includes = include_directories('microui/src')
+
+extra_src = []
+extra_obj = []
+static_libs = false
+
+if target_machine.system() == 'windows'
+  windres = find_program('windres')
+  run_command(windres, 'src/win32/resource.rc', 'src/win32/resource.o')
+  extra_src = [
+    'src/win32/gui_windows.c',
+  ]
+  extra_obj = [
+    'src/win32/resource.o',
+  ]
+  add_project_arguments('-DPLATFORM_WIN32', language: 'c')
+  static_libs = true
+endif
+
+git = find_program('git', required: false)
+if git.found()
+  gitargs = ['describe', '--tags', '--dirty', '--always']
+  describe = run_command(git, gitargs, check: false).stdout().strip()
+  if describe != ''
+    add_project_arguments('-DGIT_DESCRIBE="' + describe + '"', language: 'c')
+  endif
+endif
+
+deps = [
+  dependency('zlib', static: static_libs),
+  dependency('sdl2', static: static_libs),
+  dependency('libxxhash', static: static_libs),
+  dependency('freetype2', static: static_libs),
+]
+
+add_project_link_arguments('-lstdc++', language: 'c')
+
+exe = executable(
+  'sleepdart',
+  'src/main.c',
+  'src/argparser.c',
+  'src/audio_sdl.c',
+  'src/ay.c',
+  'src/beeper.c',
+  'src/config.c',
+  'src/config_parser.c',
+  'src/debugger.c',
+  'src/disasm.c',
+  'src/dsp.c',
+  'src/file.c',
+  'src/hotkeys.c',
+  'src/input_sdl.c',
+  'src/io.c',
+  'src/keyboard.c',
+  'src/keyboard_macro.c',
+  'src/log.c',
+  'src/machine.c',
+  'src/machine_hooks.c',
+  'src/machine_test.c',
+  'src/memory.c',
+  'src/microui_render.c',
+  'src/palette.c',
+  'src/parser_helpers.c',
+  'src/szx_file.c',
+  'src/szx_state.c',
+  'src/tape.c',
+  'src/ula.c',
+  'src/video_sdl.c',
+  'src/z80.c',
+  'microui/src/microui.c',
+  'ayumi/ayumi.c',
+  extra_src,
+  include_directories: includes,
+  dependencies: deps,
+  objects: extra_obj,
+  win_subsystem: 'windows',
+  link_args: '-lm',
+)
+
+# a lil hacky...
+dest = meson.project_source_root()
+custom_target(
+  'finalize',
+  depends: exe,
+  input: exe,
+  output: 'fake',
+  command: ['cp', '@INPUT@', dest],
+  build_by_default : true)

src/config_parser.c

@@ -231,7 +231,7 @@ int config_get_float(CfgData_t *cfg, const char *key, float *dest)
     return 0;
 }
 
-void config_set_str(CfgData_t *cfg, const char *key, char *value)
+void config_set_str(CfgData_t *cfg, const char *key, const char *value)
 {
     if (value == NULL) {
         return;

src/config_parser.h

@@ -37,6 +37,6 @@ int config_get_int(CfgData_t *cfg, const char *key, int *dest);
  * config value gets copied to dest */
 int config_get_float(CfgData_t *cfg, const char *key, float *dest);
 
-void config_set_str(CfgData_t *cfg, const char *key, char *value);
+void config_set_str(CfgData_t *cfg, const char *key, const char *value);
 void config_set_int(CfgData_t *cfg, const char *key, int value);
 void config_set_float(CfgData_t *cfg, const char *key, float value);