Optional PNG

Author: pipe01

CMakeLists.txt

@@ -7,14 +7,19 @@ if(CMAKE_TOOLCHAIN_FILE MATCHES "Emscripten.cmake")
     message("[*] Building using Emscripten toolchain")
 endif()
 
-find_package(PNG REQUIRED)
+find_package(PNG)
+if(PNG_FOUND)
+    add_compile_definitions(-DENABLE_PNG=1)
+endif()
 
 include("./cmake/bundle.cmake")
 
 include_directories(include lib .)
 
 add_subdirectory(lib/tiny-AES-c)
 
+add_compile_options(-g -O0)
+
 option(CAPSTONE_ARCHITECTURE_DEFAULT "" OFF)
 option(CAPSTONE_ARM_SUPPORT "" ON)
 add_subdirectory(lib/capstone)

Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:1.23.2-bookworm AS builder
-RUN apt-get update && apt-get install -y wget git gcc-12 g++ make cmake pkg-config libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libopengl-dev libglx-dev libglu1-mesa-dev freeglut3-dev libxxf86vm-dev
+RUN apt-get update && apt-get install -y wget git gcc-12 g++ make cmake pkg-config libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libopengl-dev libglx-dev libglu1-mesa-dev freeglut3-dev libxxf86vm-dev libpng-dev
 
 WORKDIR /app
 COPY . .

include/lua.h

@@ -2,5 +2,5 @@
 
 #include "pinetime.h"
 
-void run_lua(const char *script, size_t script_size, const char *name, pinetime_t *pt);
-void run_lua_file(const char *script_path, pinetime_t *pt);
+void run_lua(const char *script, size_t script_size, const char *name);
+void run_lua_file(const char *script_path);

src/lua.c

@@ -3,7 +3,7 @@
 
 #include "util.h"
 
-void run_lua(const char *script, size_t script_size, const char *name, pinetime_t *pt)
+void run_lua(const char *script, size_t script_size, const char *name)
 {
     lua_State *L = luaL_newstate();
 
@@ -19,10 +19,10 @@ void run_lua(const char *script, size_t script_size, const char *name, pinetime_
         fprintf(stderr, "Failed to run Lua script: %s\n", lua_tostring(L, -1));
     }
 
-    lua_close(L);
+    // lua_close(L);
 }
 
-void run_lua_file(const char *script_path, pinetime_t *pt)
+void run_lua_file(const char *script_path)
 {
     size_t script_size;
     uint8_t *script = read_file_u8(script_path, &script_size);
@@ -33,7 +33,7 @@ void run_lua_file(const char *script_path, pinetime_t *pt)
         return;
     }
 
-    run_lua((const char *)script, script_size, script_path, pt);
+    run_lua((const char *)script, script_size, script_path);
 
     free(script);
 }

src/lualibs/lua_image.c

@@ -18,7 +18,9 @@ typedef struct
 #define DATA_TYPE image_t
 #include "lualibs/lualibs.h"
 
+#if ENABLE_PNG
 #include <png.h>
+#endif
 
 void draw_image(image_t *dst, image_t *src, size_t x, size_t y)
 {
@@ -128,6 +130,7 @@ DEF_FN(new)
 
 DEF_FN(load)
 {
+#if ENABLE_PNG
     const char *filename = luaL_checkstring(L, 1);
 
     FILE *fp = fopen(filename, "rb");
@@ -192,6 +195,10 @@ DEF_FN(load)
     fclose(fp);
 
     return 1;
+#else // ENABLE_PNG
+    luaL_error(L, "PNG support not enabled");
+    return 0;
+#endif // ENABLE_PNG
 }
 
 DEF_FN(combine)
@@ -268,6 +275,7 @@ DEF_FN(combine)
 
 DEF_FN(save)
 {
+#if ENABLE_PNG
     image_t *image = lua_getdata(L, 1);
 
     const char *filename = luaL_checkstring(L, 2);
@@ -312,6 +320,10 @@ DEF_FN(save)
     png_destroy_write_struct(&png, &info);
 
     return 0;
+#else
+    luaL_error(L, "PNG support not enabled");
+    return 0;
+#endif // ENABLE_PNG
 }
 
 DEF_FN(__eq)

src/main.c

@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 
     if (lua_script_path)
     {
-        run_lua_file(lua_script_path, NULL);
+        run_lua_file(lua_script_path);
         return 0;
     }