mirror of
https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git
synced 2025-07-05 21:25:12 +08:00
Merge pull request #125 from nyue/master
Fix bug in handling OS X build via CMake
This commit is contained in:
commit
dd7c9efbea
@ -7,17 +7,17 @@ find_package ( GLEW REQUIRED )
|
|||||||
find_package ( GLFW3 REQUIRED )
|
find_package ( GLFW3 REQUIRED )
|
||||||
find_package ( OpenGL REQUIRED )
|
find_package ( OpenGL REQUIRED )
|
||||||
|
|
||||||
if (apple)
|
if (APPLE)
|
||||||
find_library(COCOA_LIBRARY Cocoa)
|
find_library(COCOA_LIBRARY Cocoa)
|
||||||
find_library(COREVIDEO_LIBRARY CoreVideo)
|
find_library(COREVIDEO_LIBRARY CoreVideo)
|
||||||
find_library(IOKIT_LIBRARY IOKit)
|
find_library(IOKIT_LIBRARY IOKit)
|
||||||
else ()
|
else ()
|
||||||
if (NOT win32)
|
if (NOT WIN32)
|
||||||
# This means it is Unices
|
# This means it is Unices
|
||||||
set ( GLFW3_UNIX_LINK_LIBRARIES X11 Xxf86vm Xrandr Xi Xinerama Xcursor )
|
set ( GLFW3_UNIX_LINK_LIBRARIES X11 Xxf86vm Xrandr Xi Xinerama Xcursor )
|
||||||
find_package (Threads)
|
find_package (Threads)
|
||||||
endif()
|
endif()
|
||||||
endif (apple)
|
endif (APPLE)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user