From de8513f212920ab02250fc089a896e9db30964aa Mon Sep 17 00:00:00 2001
From: Valerio Santinelli <santinelli@altralogica.it>
Date: Thu, 2 May 2024 19:05:49 +0200
Subject: [PATCH] Misc changes to accommodate luasocket

---
 .idea/misc.xml                    | 3 +++
 example/CMakeLists.txt            | 5 +++++
 src/CMakeLists.txt                | 6 ++++++
 src/deps/luasocket/CMakeLists.txt | 1 +
 4 files changed, 15 insertions(+)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8822db8f..7c97963d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CMakePythonSetting">
+    <option name="pythonIntegrationState" value="YES" />
+  </component>
   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 5d3396aa..d0d16783 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -27,18 +27,21 @@ if (APPLE)
     if (IOS)
         include_directories(${CMAKE_SOURCE_DIR}/src/deps/sdl/include/configs/default)
         include_directories(${PROJECT_SOURCE_DIR}/src/deps/lua/src)
+        include_directories(${PROJECT_SOURCE_DIR}/src/deps/luasocket/src)
     else ()
         include_directories(${CMAKE_SOURCE_DIR}/src/deps/sdl/include/configs/mac)
         include_directories(${CMAKE_SOURCE_DIR}/src/deps/glew/include)
         # we're using lua instead of luajit on macos to be able to test with valgrind
         #include_directories(${CMAKE_SOURCE_DIR}/src/deps/luajit/src)
         include_directories(${CMAKE_SOURCE_DIR}/src/deps/lua/src)
+        include_directories(${CMAKE_SOURCE_DIR}/src/deps/luasocket/src)
         include_directories(${CMAKE_SOURCE_DIR}/src/deps/newton)
     endif ()
 endif ()
 
 if (ANDROID)
     include_directories(${PROJECT_SOURCE_DIR}/src/deps/luajit/src)
+    include_directories(${PROJECT_SOURCE_DIR}/src/deps/luasocket/src)
     include_directories(${CMAKE_SOURCE_DIR}/src/deps/sdl/include/configs/default)
 endif ()
 
@@ -46,12 +49,14 @@ if (WIN32)
     # we're using lua instead of luajit on macos to be able to test with valgrind
     #include_directories(${PROJECT_SOURCE_DIR}/src/deps/luajit/src)
     include_directories(${CMAKE_SOURCE_DIR}/src/deps/lua/src)
+    include_directories(${CMAKE_SOURCE_DIR}/src/deps/luasocket/src)
     include_directories(${CMAKE_SOURCE_DIR}/src/deps/sdl/include/configs/windows)
     include_directories(${CMAKE_SOURCE_DIR}/src/deps/glew/include)
 endif ()
 
 if (EMSCRIPTEN)
     include_directories(${PROJECT_SOURCE_DIR}/src/deps/lua/src)
+    include_directories(${PROJECT_SOURCE_DIR}/src/deps/luasocket/src)
     include_directories(${CMAKE_SOURCE_DIR}/src/deps/sdl/include/configs/default)
 endif ()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ef01ecb..5529d32e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ if (NOT EMSCRIPTEN)
 else()
     set(BINOCLE_STATIC_LIBS ${BINOCLE_STATIC_LIBS}
             $<TARGET_OBJECTS:lua>
+            $<TARGET_OBJECTS:luasocket>
             )
 endif()
 
@@ -53,10 +54,12 @@ if (APPLE AND NOT IOS)
     if (BINOCLE_LUAJIT)
         set(BINOCLE_STATIC_LIBS ${BINOCLE_STATIC_LIBS}
                 $<TARGET_OBJECTS:libluajit>
+                $<TARGET_OBJECTS:luasocket>
                 )
     else ()
         set(BINOCLE_STATIC_LIBS ${BINOCLE_STATIC_LIBS}
                 $<TARGET_OBJECTS:lua>
+                $<TARGET_OBJECTS:luasocket>
                 )
     endif()
 endif()
@@ -64,6 +67,7 @@ endif()
 if (IOS)
     set(BINOCLE_STATIC_LIBS ${BINOCLE_STATIC_LIBS}
             $<TARGET_OBJECTS:lua>
+            $<TARGET_OBJECTS:luasocket>
             )
 endif()
 
@@ -72,6 +76,7 @@ if (ANDROID)
             $<TARGET_OBJECTS:vorbisidec>
             #$<TARGET_OBJECTS:luajit-5.1>
             $<TARGET_OBJECTS:lua>
+            $<TARGET_OBJECTS:luasocket>
             )
 endif()
 
@@ -81,6 +86,7 @@ if (MSVC)
             # we're using lua instead of luajit on macos to be able to test with valgrind
             #$<TARGET_OBJECTS:luajit-5.1>
             $<TARGET_OBJECTS:lua>
+            $<TARGET_OBJECTS:luasocket>
             )
     if (BINOCLE_HTTP)
         set(BINOCLE_STATIC_LIBS ${BINOCLE_STATIC_LIBS}
diff --git a/src/deps/luasocket/CMakeLists.txt b/src/deps/luasocket/CMakeLists.txt
index 9420da3a..70f5667a 100644
--- a/src/deps/luasocket/CMakeLists.txt
+++ b/src/deps/luasocket/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(luasocket)
 
 include_directories(.)
+include_directories(../lua/src)
 
 file(GLOB SOURCES
         auxiliar.c