mirror of
https://github.com/charlesthobe/chdman.git
synced 2025-05-13 10:12:08 +00:00
Remove librt which isn't available on macOS
inconsequential cmake edits as well
This commit is contained in:
parent
afde6771c3
commit
a343665035
@ -53,4 +53,4 @@ target_compile_definitions(chdman PRIVATE
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(chdman PRIVATE utils expat 7z ocore_sdl zlib flac utf8proc
|
target_link_libraries(chdman PRIVATE utils expat 7z ocore_sdl zlib flac utf8proc
|
||||||
dl rt m pthread util)
|
dl m pthread util)
|
||||||
|
@ -14,7 +14,7 @@ if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles" OR ${CMAKE_GENERATOR} STREQUAL "
|
|||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -O0")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -O0")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") #fixme: or android
|
if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-enum-conversion")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-enum-conversion")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#zlib
|
#zlib
|
||||||
set(zlib_dir ${CMAKE_SOURCE_DIR}/3rdparty/zlib)
|
set(zlib_dir ${CMAKE_SOURCE_DIR}/3rdparty/zlib)
|
||||||
|
|
||||||
if(CMAKE_C_COMPILER_ID STREQUAL "Clang") #fixme: or android
|
if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-shift-negative-value")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-shift-negative-value")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user