Skip to content

Commit

Permalink
Merge pull request #137 from tals/develop
Browse files Browse the repository at this point in the history
Fix Android build
  • Loading branch information
yse authored Nov 6, 2018
2 parents 001a825 + c3b4ab1 commit caac93c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion easy_profiler_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ easy_define_target_option(easy_profiler EASY_OPTION_PREDEFINED_COLORS EASY_OPTIO
# Add platform specific compile options:
if (UNIX)
target_compile_options(easy_profiler PRIVATE -Wall -Wno-long-long -Wno-reorder -Wno-braced-scalar-init -pedantic)
target_link_libraries(easy_profiler pthread)
if (!ANDROID)
target_link_libraries(easy_profiler pthread)
endif()
elseif (WIN32)
target_compile_definitions(easy_profiler PRIVATE -D_WIN32_WINNT=0x0600 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
target_link_libraries(easy_profiler ws2_32 psapi)
Expand Down

0 comments on commit caac93c

Please sign in to comment.