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/CMakeLists.txt b/CMakeLists.txt index 2885fcb..c7f5d71 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/uv/*.c) +add_library(uv.hdll STATIC ${libuv}) +target_include_directories(uv.hdll PUBLIC libuv/include) +target_link_libraries(uv.hdll uv) + # 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) diff --git a/libuv b/libuv new file mode 160000 index 0000000..e613fdd --- /dev/null +++ b/libuv @@ -0,0 +1 @@ +Subproject commit e613fdd83cb1fb448ac0ebace7ade055d0068829