Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	tests/modes.c
This commit is contained in:
Camilla Berglund
2012-08-14 14:02:37 +02:00
parent 854e634fec 6399fb19fd
commit 39c171a61d
53 changed files with 517 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+1 -2
View File
@@ -1,4 +1,3 @@
include_directories(${GLFW_SOURCE_DIR}/src
${GLFW_BINARY_DIR}/src
${glfw_INCLUDE_DIRS})
@@ -59,5 +58,5 @@ if (BUILD_SHARED_LIBS)
target_link_libraries(glfw LINK_INTERFACE_LIBRARIES)
endif()
install(TARGETS glfw DESTINATION lib)
install(TARGETS glfw DESTINATION lib${LIB_SUFFIX} )