Flattened source tree.

CMakeLists.txt

@@ -15,19 +15,6 @@ include(CheckSymbolExists)
 
 find_package(OpenGL REQUIRED)
 
-set(common_SOURCES 
-    ${GLFW_SOURCE_DIR}/src/enable.c 
-    ${GLFW_SOURCE_DIR}/src/error.c
-    ${GLFW_SOURCE_DIR}/src/fullscreen.c
-    ${GLFW_SOURCE_DIR}/src/gamma.c
-    ${GLFW_SOURCE_DIR}/src/init.c 
-    ${GLFW_SOURCE_DIR}/src/input.c 
-    ${GLFW_SOURCE_DIR}/src/joystick.c 
-    ${GLFW_SOURCE_DIR}/src/opengl.c 
-    ${GLFW_SOURCE_DIR}/src/time.c
-    ${GLFW_SOURCE_DIR}/src/window.c
-)
-
 #--------------------------------------------------------------------
 # Set up GLFW for Win32 and WGL on Windows
 #--------------------------------------------------------------------
@@ -41,9 +28,6 @@ if (WIN32)
     set(CMAKE_REQUIRED_LIBRARIES ${OPENGL_gl_LIBRARY})
     list(APPEND GLFW_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
     list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY})
-
-    # Select platform specific code
-    add_subdirectory(src/win32)
 endif (WIN32)
 
 #--------------------------------------------------------------------
@@ -105,9 +89,6 @@ if (UNIX AND NOT APPLE AND NOT CYGWIN)
     if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
         set(_GLFW_USE_LINUX_JOYSTICKS 1)
     endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-
-    # Select platform specific code
-    add_subdirectory(src/x11)
 endif(UNIX AND NOT APPLE AND NOT CYGWIN)
 
 #--------------------------------------------------------------------
@@ -135,14 +116,12 @@ if (UNIX AND APPLE)
     find_library(COCOA_FRAMEWORK Cocoa)
     list(APPEND GLFW_LIBRARIES ${COCOA_FRAMEWORK})
     list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY})
-
-    # Select platform specific code
-    add_subdirectory(src/cocoa)
 endif(UNIX AND APPLE)
 
 #--------------------------------------------------------------------
-# Add example and test programs
+# Add subdirectories
 #--------------------------------------------------------------------
+add_subdirectory(src)
 add_subdirectory(examples)
 add_subdirectory(tests)
 

src/cocoa/CMakeLists.txt

@@ -1,40 +0,0 @@
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
-               ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
-                    ${GLFW_SOURCE_DIR}/src
-                    ${GLFW_BINARY_DIR}/src
-                    ${GLFW_INCLUDE_DIR})
-
-set(cocoa_SOURCES cocoa_enable.m
-                  cocoa_fullscreen.m
-                  cocoa_gamma.m
-                  cocoa_init.m
-                  cocoa_joystick.m
-                  cocoa_opengl.m
-                  cocoa_time.m
-                  cocoa_window.m)
-
-# For some reason, CMake doesn't know about .m
-set_source_files_properties(${cocoa_SOURCES} PROPERTIES LANGUAGE C)
-
-set(libglfw_SOURCES ${common_SOURCES} ${cocoa_SOURCES})
-
-add_library(libglfwStatic STATIC ${libglfw_SOURCES})
-add_library(libglfwShared SHARED ${libglfw_SOURCES}) 
-target_link_libraries(libglfwShared  ${GLFW_LIBRARIES})
-set_target_properties(libglfwStatic libglfwShared PROPERTIES 
-                      CLEAN_DIRECT_OUTPUT 1
-                      OUTPUT_NAME glfw)
-
-# Append -fno-common to the compile flags to work around a bug in the Apple GCC
-get_target_property(CFLAGS libglfwShared COMPILE_FLAGS)
-if(NOT CFLAGS)
-    set(CFLAGS "")
-endif(NOT CFLAGS)
-set_target_properties(libglfwShared PROPERTIES COMPILE_FLAGS "${CFLAGS} -fno-common")
-
-install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)
-

src/cocoa/libglfw.pc.cmake

@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib
-includedir=@PREFIX@/include
-
-Name: GLFW
-Description: A portable library for OpenGL development
-Version: 3.0
-URL: http://www.glfw.org/
-Libs: -L${libdir} -lglfw -framework AGL -framework OpenGL -framework Carbon
-Cflags: -I${includedir}

src/internal.h

@@ -58,11 +58,18 @@
 
 #include "config.h"
 
-#include "../../include/GL/glfw3.h"
+#include "../include/GL/glfw3.h"
-#include "../../include/GL/glext.h"
+#include "../include/GL/glext.h"
-
+
-#include "platform.h"
+#if defined(_GLFW_COCOA_NSGL)
-
+#include "cocoa_platform.h"
+#elif defined(_GLFW_WIN32_WGL)
+#include "win32_platform.h"
+#elif defined(_GLFW_X11_GLX)
+#include "x11_platform.h"
+#else
+#error "No supported platform selected"
+#endif
 
 typedef struct _GLFWhints _GLFWhints;
 typedef struct _GLFWwndconfig _GLFWwndconfig;

src/win32/CMakeLists.txt

@@ -1,59 +0,0 @@
-
-if(CYGWIN)
-
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
-	           ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
-
-# These lines are intended to remove the --export-all-symbols
-# flag added in the Modules/Platform/CYGWIN.cmake file of the
-# CMake distribution.
-# This is a HACK.  If you have trouble _linking_ the GLFW
-# _shared_ library on Cygwin, try disabling this.
-    set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-    set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-
-endif(CYGWIN)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
-                    ${GLFW_SOURCE_DIR}/src
-                    ${GLFW_BINARY_DIR}/src
-                    ${GLFW_INCLUDE_DIR})
-
-set(libglfw_SOURCES ${common_SOURCES}
-                    win32_enable.c 
-                    win32_fullscreen.c
-                    win32_gamma.c
-                    win32_init.c 
-                    win32_joystick.c
-                    win32_opengl.c
-                    win32_time.c 
-                    win32_window.c
-                    win32_dllmain.c)
-
-add_library(libglfwStatic STATIC ${libglfw_SOURCES})
-add_library(libglfwShared SHARED ${libglfw_SOURCES}) 
-
-target_link_libraries(libglfwShared ${OPENGL_gl_LIBRARY})
-set_target_properties(libglfwShared PROPERTIES 
-                      DEFINE_SYMBOL GLFW_BUILD_DLL
-                      PREFIX ""
-                      IMPORT_PREFIX ""
-                      IMPORT_SUFFIX "dll.lib")
-
-set_target_properties(libglfwStatic libglfwShared PROPERTIES 
-                      CLEAN_DIRECT_OUTPUT 1
-                      OUTPUT_NAME glfw)
-
-if(CYGWIN)
-    # Build for the regular Win32 environment (not Cygwin)
-    set_target_properties(libglfwStatic libglfwShared PROPERTIES
-                          COMPILE_FLAGS "-mwin32 -mno-cygwin"
-                          LINK_FLAGS "-mwin32 -mno-cygwin")
-endif(CYGWIN)
-
-install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
-
-if(CYGWIN)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)
-endif(CYGWIN)
-

src/win32/libglfw.pc.cmake

@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GLFW
-Description: A portable library for OpenGL development
-Version: 3.0
-URL: http://www.glfw.org/
-Libs: -L${libdir} -lglfw @GLFW_LIBRARIES@
-Cflags: -I${includedir} -mwin32

src/x11/CMakeLists.txt

@@ -1,30 +0,0 @@
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
-               ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
-                    ${GLFW_SOURCE_DIR}/src
-                    ${GLFW_BINARY_DIR}/src
-                    ${GLFW_INCLUDE_DIR})
-
-set(libglfw_SOURCES ${common_SOURCES}
-                    x11_enable.c 
-                    x11_fullscreen.c
-                    x11_gamma.c
-                    x11_init.c 
-                    x11_joystick.c
-                    x11_keysym2unicode.c
-                    x11_opengl.c
-                    x11_time.c 
-                    x11_window.c)
-
-add_library(libglfwStatic STATIC ${libglfw_SOURCES})
-add_library(libglfwShared SHARED ${libglfw_SOURCES}) 
-target_link_libraries(libglfwShared  ${GLFW_LIBRARIES})
-set_target_properties(libglfwStatic libglfwShared PROPERTIES 
-                      CLEAN_DIRECT_OUTPUT 1
-                      OUTPUT_NAME glfw)
-
-install(TARGETS libglfwStatic libglfwShared DESTINATION lib)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc DESTINATION lib/pkgconfig)
-

src/x11/libglfw.pc.cmake

@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: GLFW
-Description: A portable library for OpenGL development
-Version: 3.0
-URL: http://www.glfw.org/
-Libs: -L${libdir} -lglfw @GLFW_LIBRARIES@
-Cflags: -I${includedir}