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

Merge branch 'master' of github.com:raedwulf/glfw into clipboard

Browse Source 
Conflicts:
	tests/CMakeLists.txt
This commit is contained in:
Tai Chi Minh Ralph Eastwood
2012-02-19 06:17:52 +00:00
parent a3430c2dec 2660b27cf3
commit d561e3a0b0
26 changed files with 419 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/CMakeLists.txt
+3 -3
View File
@@ -11,12 +11,12 @@ add_executable(events events.c)
add_executable(fsaa fsaa.c getopt.c)
add_executable(fsfocus fsfocus.c)
add_executable(gamma gamma.c getopt.c)
add_executable(glfwinfo glfwinfo.c getopt.c)
add_executable(iconify iconify.c getopt.c)
add_executable(joysticks joysticks.c)
add_executable(listmodes listmodes.c)
add_executable(peter peter.c)
add_executable(reopen reopen.c)
add_executable(version version.c getopt.c)
if(APPLE)
# Set fancy names for bundles
@@ -33,8 +33,8 @@ else()
endif(APPLE)
set(WINDOWS_BINARIES accuracy sharing tearing windows)
set(CONSOLE_BINARIES clipboard defaults events fsaa fsfocus gamma iconify
joysticks listmodes peter reopen version)
set(CONSOLE_BINARIES clipboard defaults events fsaa fsfocus gamma glfwinfo iconify
joysticks listmodes peter reopen)
if(MSVC)
# Tell MSVC to use main instead of WinMain for Windows subsystem executables