From aa225f7c3ad3f087d3662c30fcf7cf72d354cdbf Mon Sep 17 00:00:00 2001
From: Clement Sibille <clements+github@lisible.xyz>
Date: Mon, 10 Jun 2024 12:52:20 +0900
Subject: Revert "Setup cross-compilation for playdate"

This reverts commit 4c88f44d42c5aace3264bfc656ae656b6b3e7373.
---
 cross/playdate.txt     | 11 -----------
 lisiblepng/meson.build |  6 +++---
 meson.build            |  5 +----
 subprojects/lisiblestd |  1 -
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 cross/playdate.txt
 delete mode 120000 subprojects/lisiblestd

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
-- 
cgit v1.2.3