[ox] Cleanup, fix GBA build
This commit is contained in:
parent
f4ef762952
commit
6bd7a84ddd
13
deps/ox/src/ox/CMakeLists.txt
vendored
13
deps/ox/src/ox/CMakeLists.txt
vendored
@ -1,5 +1,14 @@
|
|||||||
set(OX_FREEBSD ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||||
set(OX_LINUX ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
set(OX_OS_FREEBSD TRUE)
|
||||||
|
else()
|
||||||
|
set(OX_OS_FREEBSD FALSE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||||
|
set(OX_OS_LINUX TRUE)
|
||||||
|
else()
|
||||||
|
set(OX_OS_LINUX FALSE)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(OX_USE_STDLIB)
|
if(OX_USE_STDLIB)
|
||||||
add_subdirectory(oc)
|
add_subdirectory(oc)
|
||||||
|
2
deps/ox/src/ox/fs/CMakeLists.txt
vendored
2
deps/ox/src/ox/fs/CMakeLists.txt
vendored
@ -16,7 +16,7 @@ if(NOT MSVC)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT OX_BARE_METAL)
|
if(NOT OX_BARE_METAL)
|
||||||
if(NOT APPLE AND NOT MSVC AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
if(NOT APPLE AND NOT MSVC AND NOT ${OX_OS_FREEBSD})
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
OxFS PUBLIC
|
OxFS PUBLIC
|
||||||
stdc++fs
|
stdc++fs
|
||||||
|
2
deps/ox/src/ox/logconn/CMakeLists.txt
vendored
2
deps/ox/src/ox/logconn/CMakeLists.txt
vendored
@ -20,7 +20,7 @@ target_link_libraries(
|
|||||||
OxLogConn PUBLIC
|
OxLogConn PUBLIC
|
||||||
OxStd
|
OxStd
|
||||||
OxMetalClaw
|
OxMetalClaw
|
||||||
$<$<BOOL:OX_FREEBSD>:pthread>
|
$<$<BOOL:${OX_OS_FREEBSD}>:pthread>
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
4
deps/ox/src/ox/std/CMakeLists.txt
vendored
4
deps/ox/src/ox/std/CMakeLists.txt
vendored
@ -44,10 +44,10 @@ add_library(
|
|||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
target_compile_options(OxStd PRIVATE -Wsign-conversion)
|
target_compile_options(OxStd PRIVATE -Wsign-conversion)
|
||||||
target_compile_options(OxStd PRIVATE -Wconversion)
|
target_compile_options(OxStd PRIVATE -Wconversion)
|
||||||
if(${OX_LINUX})
|
if(${OX_OS_LINUX})
|
||||||
target_compile_options(OxStd PUBLIC -export-dynamic)
|
target_compile_options(OxStd PUBLIC -export-dynamic)
|
||||||
#target_link_options(OxStd PUBLIC -W1,-E)
|
#target_link_options(OxStd PUBLIC -W1,-E)
|
||||||
elseif(${OX_FREEBSD})
|
elseif(${OX_OS_FREEBSD})
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
OxStd PUBLIC
|
OxStd PUBLIC
|
||||||
execinfo
|
execinfo
|
||||||
|
Loading…
Reference in New Issue
Block a user