Merge pull request #31 from arsenm/master

Fixed silent failure when no monitors were found.
This commit is contained in:
Camilla Berglund 2013-01-06 10:56:03 -08:00
commit 11b646920b
2 changed files with 4 additions and 4 deletions

View File

@ -147,6 +147,7 @@ GLFWAPI int glfwInit(void)
_glfw.monitors = _glfwPlatformGetMonitors(&_glfw.monitorCount);
if (!_glfw.monitors)
{
_glfwErrorCallback(GLFW_PLATFORM_ERROR, "No monitors found");
_glfwPlatformTerminate();
return GL_FALSE;
}

View File

@ -24,7 +24,7 @@ endif()
set(GETOPT ${GLFW_SOURCE_DIR}/support/getopt.h
${GLFW_SOURCE_DIR}/support/getopt.c)
set(TINYCTHREAD ${GLFW_SOURCE_DIR}/support/tinycthread.h
${GLFW_SOURCE_DIR}/support/tinycthread.c)
${GLFW_SOURCE_DIR}/support/tinycthread.c)
add_executable(clipboard clipboard.c ${GETOPT})
add_executable(defaults defaults.c)
@ -57,9 +57,8 @@ set_target_properties(title PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Title")
add_executable(windows WIN32 MACOSX_BUNDLE windows.c)
set_target_properties(windows PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Windows")
if (BUILD_SHARED_LIBS)
target_link_libraries(threads ${thread_LIBRARIES})
endif()
target_link_libraries(threads ${thread_LIBRARIES})
set(WINDOWS_BINARIES accuracy sharing tearing threads title windows)
set(CONSOLE_BINARIES clipboard defaults events fsaa fsfocus gamma glfwinfo