Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add libuv #3

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add libuv #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cef751
Add libuv submodule
tobil4sk Feb 27, 2023
258bcf8
Add uv.hdll build
tobil4sk Feb 27, 2023
c19b410
Fix typo
tobil4sk Feb 27, 2023
b5293f2
Fix uv.hdll linking error
tobil4sk Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 10 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
1 change: 1 addition & 0 deletions libuv
Open in desktop
Submodule libuv added at e613fd