diff options
| author | Clement Sibille <clements+github@lisible.xyz> | 2024-06-10 12:52:20 +0900 |
|---|---|---|
| committer | Clement Sibille <clements+github@lisible.xyz> | 2024-06-10 12:52:20 +0900 |
| commit | aa225f7c3ad3f087d3662c30fcf7cf72d354cdbf (patch) | |
| tree | 90f4adcb156a33b2327c42c44972c719bc14e825 | |
| parent | 8552afa1a13e7eef4a0ead8736a3e732731aac6d (diff) | |
Revert "Setup cross-compilation for playdate"
This reverts commit 4c88f44d42c5aace3264bfc656ae656b6b3e7373.
| -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, 4 insertions, 19 deletions
diff --git a/cross/playdate.txt b/cross/playdate.txt deleted file mode 100644 index c54b4ba..0000000 --- a/cross/playdate.txt +++ /dev/null @@ -1,11 +0,0 @@ -[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 ff88871..644f974 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: [lisiblestd_dep]) -lisiblepng_dep = declare_dependency(include_directories: lisiblepng_incdir, link_with: [lisiblepng_lib], dependencies: [lisiblestd_dep]) +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]) diff --git a/meson.build b/meson.build index 379d8f1..3ce9711 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,4 @@ -project('lisiblepng', 'c', default_options: ['c_std=c18', 'warning_level=3', 'default_library=static'], version: '0.2.0') +project('lisiblepng', 'c', default_options: ['c_std=c18', 'warning_level=3'], version: '0.2.0') subdir('lisiblepng') - -if not meson.is_cross_build() subdir('lisiblepng-bin') -endif diff --git a/subprojects/lisiblestd b/subprojects/lisiblestd deleted file mode 120000 index 930b221..0000000 --- a/subprojects/lisiblestd +++ /dev/null @@ -1 +0,0 @@ -../../lisiblestd/
\ No newline at end of file |