Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw

Conflicts:
	examples/CMakeLists.txt
This commit is contained in:
Camilla Berglund
2010-09-25 19:13:40 +02:00
4 changed files with 865 additions and 3 deletions
+2 -1
View File
@@ -21,9 +21,10 @@ else(APPLE)
add_executable(splitview WIN32 splitview.c)
add_executable(triangle WIN32 triangle.c)
add_executable(wave WIN32 wave.c)
add_executable(heightmap WIN32 heightmap.c)
endif(APPLE)
set(WINDOWS_BINARIES boing gears splitview triangle wave)
set(WINDOWS_BINARIES boing gears heightmap splitview triangle wave)
set(CONSOLE_BINARIES listmodes)
if(MSVC)