From 7cef75120199cc6ba0f815e2bf476e1695aea906 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Mon, 27 Feb 2023 11:01:50 +0000 Subject: [PATCH 1/4] Add libuv submodule --- .gitmodules | 3 +++ libuv | 1 + 2 files changed, 4 insertions(+) create mode 160000 libuv diff --git a/.gitmodules b/.gitmodules index bc573c1..52af5e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ [submodule "openal-soft"] path = openal-soft url = https://github.com/kcat/openal-soft.git +[submodule "libuv"] + path = libuv + url = https://github.com/libuv/libuv.git diff --git a/libuv b/libuv new file mode 160000 index 0000000..e613fdd --- /dev/null +++ b/libuv @@ -0,0 +1 @@ +Subproject commit e613fdd83cb1fb448ac0ebace7ade055d0068829 From 258bcf8d7aa84543f10bc29ae95b56902b332288 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Mon, 27 Feb 2023 11:11:03 +0000 Subject: [PATCH 2/4] Add uv.hdll build --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2885fcb..0fe9b83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ file(GLOB tj_include libjpeg-turbo/jni/vendor/libjpeg-turbo/libjpeg-turbo-*) target_link_libraries(fmt.hdll ${TJ_LIB}) target_compile_definitions(fmt.hdll PRIVATE PNG_ARM_NEON_OPT=0) #disable Neon support for now -target_include_directories(fmt.hdll PRIVATE +target_include_directories(fmt.hdll PRIVATE hashlink/include/png hashlink/include/mikktspace hashlink/include/vorbis @@ -81,8 +81,16 @@ target_link_libraries(openal.hdll OpenAL) file(GLOB ui hashlink/libs/ui/ui_stub.c) add_library(ui.hdll STATIC ${ui}) +# LibUV + +add_subdirectory(libuv) +file(GLOB libuv hashlink/libs/openal/*.c) +add_library(uv.hdll STATIC ${libuv}) +target_include_directories(uv.hdll PUBLIC libuv/include) +target_link_libraries(uv.hdll libuv) + # Heaps Application add_library(heapsapp SHARED out/main.c ) target_include_directories(heapsapp PRIVATE out) -target_link_libraries(heapsapp hl sdl.hdll fmt.hdll openal.hdll ui.hdll) +target_link_libraries(heapsapp hl sdl.hdll fmt.hdll openal.hdll ui.hdll uv.hdll) From c19b4107ba3e6d2a58b3d15792e3e9e334d42d41 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Mon, 27 Feb 2023 13:01:45 +0000 Subject: [PATCH 3/4] Fix typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fe9b83..a896209 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ add_library(ui.hdll STATIC ${ui}) # LibUV add_subdirectory(libuv) -file(GLOB libuv hashlink/libs/openal/*.c) +file(GLOB libuv hashlink/libs/uv/*.c) add_library(uv.hdll STATIC ${libuv}) target_include_directories(uv.hdll PUBLIC libuv/include) target_link_libraries(uv.hdll libuv) From b5293f2c85da9bf4b6944215516263592d3506d1 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Mon, 27 Feb 2023 14:46:05 +0000 Subject: [PATCH 4/4] Fix uv.hdll linking error --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a896209..c7f5d71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ add_subdirectory(libuv) file(GLOB libuv hashlink/libs/uv/*.c) add_library(uv.hdll STATIC ${libuv}) target_include_directories(uv.hdll PUBLIC libuv/include) -target_link_libraries(uv.hdll libuv) +target_link_libraries(uv.hdll uv) # Heaps Application