Skip to content

Adding FreeBSD build support. #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding FreeBSD build support. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ if(PLATFORM_ANDROID)
add_subdirectory(Android/HelloAR)
endif()

if(NOT ${DILIGENT_BUILD_SAMPLE_BASE_ONLY} AND (D3D11_SUPPORTED OR D3D12_SUPPORTED OR GL_SUPPORTED OR GLES_SUPPORTED))
if(NOT PLATFORM_FREEBSD AND NOT ${DILIGENT_BUILD_SAMPLE_BASE_ONLY} AND (D3D11_SUPPORTED OR D3D12_SUPPORTED OR GL_SUPPORTED OR GLES_SUPPORTED))
add_subdirectory(UnityPlugin)
endif()

Expand Down
2 changes: 1 addition & 1 deletion SampleBase/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ elseif(PLATFORM_ANDROID)
target_link_libraries(Diligent-SampleBase PRIVATE GLESv3 PUBLIC native_app_glue)
elseif(PLATFORM_LINUX)
find_package(X11 REQUIRED)
target_link_libraries(Diligent-SampleBase PRIVATE XCBKeySyms ${OPENGL_LIBRARY} X11::X11)
target_link_libraries(Diligent-SampleBase PRIVATE XCBKeySyms ${OPENGL_LIBRARY} ${X11_LIBRARIES})
elseif(PLATFORM_MACOS OR PLATFORM_IOS)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering, why X11::X11 does not work - this is supposed to be the official way to link with X11 using CMake.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea why it doesn't work, I just know it doesn't.


endif()
Expand Down