Skip to content

Commit

Permalink
【Build】Don't set PLATFORM_LINUX for either Web or Android
Browse files Browse the repository at this point in the history
  • Loading branch information
skylersaleh committed Aug 10, 2023
1 parent 540c228 commit f38ec07
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,19 @@ endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

# Linux -pthread shenanigans
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
if ((CMAKE_SYSTEM_NAME STREQUAL Linux) AND NOT EMSCRIPTEN AND NOT ANDROID)
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
find_package(ALSA REQUIRED)
set(PLATFORM_LINUX TRUE)
endif()
if (UNIX AND NOT APPLE AND NOT PLATFORM_LINUX)
if (UNIX AND NOT APPLE AND NOT PLATFORM_LINUX AND NOT EMSCRIPTEN AND NOT ANDROID)
set(PLATFORM_FREEBSD TRUE)
find_package(ALSA REQUIRED)
link_directories(/usr/local/lib)
endif()

if (UNIX AND NOT APPLE AND NOT ANDROID)
if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
find_package(X11 REQUIRED)
endif()
# TinyFileDialogs
Expand Down Expand Up @@ -194,7 +194,7 @@ if(MACOS OR IOS)
else()
add_library(sokol STATIC src/sokol/sokol.c ${SOKOL_HEADERS})
set_property(TARGET sokol PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
if (UNIX AND NOT APPLE AND NOT ANDROID)
if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
target_include_directories(sokol PRIVATE "${X11_INCLUDE_DIR}")
target_link_libraries(sokol INTERFACE ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} OpenGL::OpenGL dl)
endif()
Expand Down

0 comments on commit f38ec07

Please sign in to comment.