Skip to content

Commit

Permalink
remove glx so we can remove the x11 dependency (#320)
Browse files Browse the repository at this point in the history
Co-authored-by: briaguya <briaguya@alice>
  • Loading branch information
briaguya-ai and briaguya authored Jul 20, 2023
1 parent 0c9aca5 commit 7d1a3dd
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 575 deletions.
8 changes: 1 addition & 7 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
${CMAKE_CURRENT_SOURCE_DIR}/graphic/Fast3D/gfx_direct3d_common.h
${CMAKE_CURRENT_SOURCE_DIR}/graphic/Fast3D/gfx_direct3d_common.cpp
)
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND Source_Files__Graphic
${CMAKE_CURRENT_SOURCE_DIR}/graphic/Fast3D/gfx_glx.h
${CMAKE_CURRENT_SOURCE_DIR}/graphic/Fast3D/gfx_glx.cpp
)
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
list(APPEND Source_Files__Graphic
${CMAKE_CURRENT_SOURCE_DIR}/graphic/Fast3D/gfx_metal.cpp
Expand Down Expand Up @@ -386,9 +381,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
endif()

if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(X11)
find_package(PulseAudio)
target_link_libraries(libultraship PRIVATE ${X11_LIBRARIES} ${PULSEAUDIO_LIBRARY})
target_link_libraries(libultraship PRIVATE ${PULSEAUDIO_LIBRARY})
endif()

#=================== Compile Options & Defs ===================
Expand Down
Loading

0 comments on commit 7d1a3dd

Please sign in to comment.