From 02c208014ca1d3770db2f7a33f3c196c05b32eef Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 11 Nov 2023 15:04:11 +0000 Subject: Use meson instead of CMake --- runtime/CMakeLists.txt | 11 ----------- runtime/makefile | 10 +++++----- runtime/meson.build | 2 ++ 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 runtime/CMakeLists.txt create mode 100644 runtime/meson.build (limited to 'runtime') diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt deleted file mode 100644 index 0ec51e0a..00000000 --- a/runtime/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.7) -project(ShedRuntime LANGUAGES C) - -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror") - -include_directories(src) - -add_library( - shed STATIC - src/shed.h src/shed.c -) diff --git a/runtime/makefile b/runtime/makefile index 29f162af..88467074 100644 --- a/runtime/makefile +++ b/runtime/makefile @@ -3,13 +3,13 @@ CFLAGS_WASM = --target=wasm32 -c -I src -Wall -Werror -D__WASM__ -O2 .PHONY: all -all: build/libshed.a build-wasm/libshed.o +all: build-amd64/libshed.a build-wasm/libshed.o -.PHONY: build/libshed.a +.PHONY: build-amd64/libshed.a -build/libshed.a: - mkdir -p build - cd build && cmake .. && make +build-amd64/libshed.a: + meson setup build-amd64 --werror + cd build-amd64 && meson compile .PHONY: build-wasm/libshed.o diff --git a/runtime/meson.build b/runtime/meson.build new file mode 100644 index 00000000..300cab2d --- /dev/null +++ b/runtime/meson.build @@ -0,0 +1,2 @@ +project('shed-runtime', 'c', default_options : ['warning_level=1']) +static_library('shed', 'src/shed.c', ) -- cgit v1.2.3