Skip to content

use system freeglut to support OSX #161

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
paroj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use system freeglut to support OSX #161

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
10 changes: 9 additions & 1 deletion framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@ file(GLOB framework_SRCS "*.cpp")
add_library(framework STATIC ${framework_SRCS})
target_include_directories(framework PUBLIC . ${CMAKE_SOURCE_DIR}/glsdk/glm)
target_link_libraries(framework
PUBLIC glload glimg glutil freeglut OpenGL::GL
PUBLIC glload glimg glutil OpenGL::GL
)

if(APPLE)
find_package(FreeGLUT REQUIRED)
target_link_libraries(framework PUBLIC FreeGLUT::freeglut)
else()
target_link_libraries(framework PUBLIC freeglut)
endif()

if(UNIX AND NOT APPLE)
target_link_libraries(framework PRIVATE X11)
endif()
20 changes: 11 additions & 9 deletions glsdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
## freeglut
file(GLOB freeglut_SRCS freeglut/src/*.c)
add_library(freeglut STATIC ${freeglut_SRCS})
target_include_directories(freeglut PUBLIC freeglut/include freeglut)
target_compile_definitions(freeglut PUBLIC -DFREEGLUT_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
if(UNIX)
target_compile_definitions(freeglut PRIVATE -DHAVE_CONFIG_H)
execute_process(COMMAND sh ./configure WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/freeglut)
else()
target_link_libraries(freeglut PRIVATE winmm)
if(NOT APPLE)
file(GLOB freeglut_SRCS freeglut/src/*.c)
add_library(freeglut STATIC ${freeglut_SRCS})
target_include_directories(freeglut PUBLIC freeglut/include freeglut)
target_compile_definitions(freeglut PUBLIC -DFREEGLUT_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
if(UNIX)
target_compile_definitions(freeglut PRIVATE -DHAVE_CONFIG_H)
execute_process(COMMAND sh ./configure WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/freeglut)
else()
target_link_libraries(freeglut PRIVATE winmm)
endif()
endif()

## glload
Expand Down