Merge branch 'master' into tls

This commit is contained in:
Camilla Berglund 2012-08-14 14:00:19 +02:00
commit 9af03e141b
9 changed files with 10 additions and 3 deletions

View File

@ -268,10 +268,10 @@ install(FILES COPYING.txt readme.html
# Create and install pkg-config file on supported platforms
#--------------------------------------------------------------------
if (_GLFW_X11_GLX OR _GLFW_COCOA_NSGL)
configure_file(${GLFW_SOURCE_DIR}/src/libglfw3.pc.in
${GLFW_BINARY_DIR}/src/libglfw3.pc @ONLY)
configure_file(${GLFW_SOURCE_DIR}/src/glfw3.pc.in
${GLFW_BINARY_DIR}/src/glfw3.pc @ONLY)
install(FILES ${GLFW_BINARY_DIR}/src/libglfw3.pc
install(FILES ${GLFW_BINARY_DIR}/src/glfw3.pc
DESTINATION lib${LIB_SUFFIX}/pkgconfig)
endif()

View File

@ -31,6 +31,7 @@
#include "internal.h"
#include <stdlib.h>
#include <malloc.h>
//========================================================================

View File

@ -32,6 +32,7 @@
#include <limits.h>
#include <string.h>
#include <stdlib.h>
#include <malloc.h>
//////////////////////////////////////////////////////////////////////////

View File

@ -32,6 +32,7 @@
#include <stdlib.h>
#include <limits.h>
#include <malloc.h>
//========================================================================

View File

@ -31,6 +31,7 @@
#include "internal.h"
#include <stdlib.h>
#include <malloc.h>
#ifdef __BORLANDC__
// With the Borland C++ compiler, we want to disable FPU exceptions

View File

@ -31,6 +31,7 @@
#include "internal.h"
#include <stdlib.h>
#include <malloc.h>
//========================================================================

View File

@ -32,6 +32,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <malloc.h>
//========================================================================

View File

@ -32,6 +32,7 @@
#include <string.h>
#include <stdlib.h>
#include <malloc.h>
//========================================================================