diff options
| -rw-r--r-- | cross/playdate.txt | 11 | ||||
| -rw-r--r-- | lisiblepng/meson.build | 6 | ||||
| -rw-r--r-- | meson.build | 5 | ||||
| l--------- | subprojects/lisiblestd | 1 |
4 files changed, 19 insertions, 4 deletions
diff --git a/cross/playdate.txt b/cross/playdate.txt new file mode 100644 index 0000000..c54b4ba --- /dev/null +++ b/cross/playdate.txt @@ -0,0 +1,11 @@ +[binaries] +c = 'arm-none-eabi-gcc' +ar = 'arm-none-eabi-ar' +strip = 'arm-none-eabi-strip' +ld = 'arm-none-eabi-ld' + +[host_machine] +system = 'none' +cpu_family = 'arm' +cpu = 'cortex-m7' +endian = 'little' diff --git a/lisiblepng/meson.build b/lisiblepng/meson.build index 644f974..ff88871 100644 --- a/lisiblepng/meson.build +++ b/lisiblepng/meson.build @@ -1,5 +1,5 @@ cc = meson.get_compiler('c') -m_dep = cc.find_library('m', required: true) +# m_dep = cc.find_library('m', required: true) if get_option('buildtype').startswith('debug') add_project_arguments('-DLPNG_DEBUG_LOG', language: ['c']) @@ -8,5 +8,5 @@ endif lisiblestd_dep = dependency('lisiblestd') lisiblepng_incdir = include_directories('src/') -lisiblepng_lib = library('lisiblepng', 'src/lisiblepng.c', 'src/lisiblepng/deflate.c', 'src/lisiblepng/bitstream.c', dependencies: [m_dep, lisiblestd_dep]) -lisiblepng_dep = declare_dependency(include_directories: lisiblepng_incdir, link_with: [lisiblepng_lib], dependencies: [m_dep, lisiblestd_dep]) +lisiblepng_lib = library('lisiblepng', 'src/lisiblepng.c', 'src/lisiblepng/deflate.c', 'src/lisiblepng/bitstream.c', dependencies: [lisiblestd_dep]) +lisiblepng_dep = declare_dependency(include_directories: lisiblepng_incdir, link_with: [lisiblepng_lib], dependencies: [lisiblestd_dep]) diff --git a/meson.build b/meson.build index 3ce9711..379d8f1 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,7 @@ -project('lisiblepng', 'c', default_options: ['c_std=c18', 'warning_level=3'], version: '0.2.0') +project('lisiblepng', 'c', default_options: ['c_std=c18', 'warning_level=3', 'default_library=static'], version: '0.2.0') subdir('lisiblepng') + +if not meson.is_cross_build() subdir('lisiblepng-bin') +endif diff --git a/subprojects/lisiblestd b/subprojects/lisiblestd new file mode 120000 index 0000000..930b221 --- /dev/null +++ b/subprojects/lisiblestd @@ -0,0 +1 @@ +../../lisiblestd/
\ No newline at end of file |