mirror of
https://github.com/glfw/glfw.git
synced 2026-11-18 04:44:54 +00:00
Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw
This commit is contained in:
@@ -4,7 +4,8 @@ configure_file(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
${GLFW_SOURCE_DIR}/src
|
||||
${GLFW_BINARY_DIR}/src
|
||||
${GLFW_INCLUDE_DIR})
|
||||
|
||||
set(cocoa_SOURCES
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
/* Configure build time options of GLFW */
|
||||
|
||||
/* Define this to 1 if XRandR is available */
|
||||
#cmakedefine _GLFW_HAS_XRANDR 1
|
||||
/* Define this to 1 if Xf86VidMode is available */
|
||||
/* Define this to 1 if XRandR is available */
|
||||
#cmakedefine _GLFW_HAS_XRANDR 1
|
||||
/* Define this to 1 if Xf86VidMode is available */
|
||||
#cmakedefine _GLFW_HAS_XF86VIDMODE 1
|
||||
|
||||
/* Define this to 1 if glXGetProcAddress is available */
|
||||
|
||||
@@ -14,8 +14,9 @@ if(CYGWIN)
|
||||
|
||||
endif(CYGWIN)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${GLFW_SOURCE_DIR}/src
|
||||
${GLFW_BINARY_DIR}/src
|
||||
${GLFW_INCLUDE_DIR})
|
||||
|
||||
set(libglfw_SOURCES
|
||||
|
||||
@@ -1016,6 +1016,7 @@ GLFWAPI int glfwGetWindowParam(GLFWwindow window, int param)
|
||||
case GLFW_OPENGL_PROFILE:
|
||||
return window->glProfile;
|
||||
default:
|
||||
_glfwSetError(GLFW_INVALID_ENUM);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,11 +3,10 @@ configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
${GLFW_INCLUDE_DIR})
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${GLFW_SOURCE_DIR}/src
|
||||
${GLFW_BINARY_DIR}/src
|
||||
${GLFW_INCLUDE_DIR})
|
||||
|
||||
set(libglfw_SOURCES
|
||||
${common_SOURCES}
|
||||
|
||||
Reference in New Issue
Block a user