Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-23 02:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://85.24.143.159

Browse Source
This commit is contained in:
Camilla Berglund 2010-11-23 23:43:26 +01:00
commit 27ba3c6996
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -115,10 +115,17 @@ if (UNIX AND APPLE)
# Define the platform identifier # Define the platform identifier
set(_GLFW_COCOA_NSGL 1) set(_GLFW_COCOA_NSGL 1)
option(GLFW_BUILD_UNIVERSAL "Build the GLFW library and examples as Universal Binaries" FALSE)
# Universal build, decent set of warning flags... # Universal build, decent set of warning flags...
set(CMAKE_OSX_ARCHITECTURES ppc;i386;ppc64;x86_64) if (GLFW_BUILD_UNIVERSAL)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) message(STATUS "Building GLFW as Universal Binaries")
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5 -Wall -Wextra -Wno-unused-parameter -Werror") set(CMAKE_OSX_ARCHITECTURES ppc;i386;ppc64;x86_64)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5 -Wall -Wextra -Wno-unused-parameter -Werror")
else(GLFW_BUILD_UNIVERSAL)
message(STATUS "Building GLFW only for the native architecture")
endif(GLFW_BUILD_UNIVERSAL)
# Set up library and include paths # Set up library and include paths
find_library(COCOA_FRAMEWORK Cocoa) find_library(COCOA_FRAMEWORK Cocoa)

8
include/GL/glfw3.h
View File

@ -1,4 +1,4 @@
/************************************************************************ /*************************************************************************
* GLFW - An OpenGL framework * GLFW - An OpenGL framework
* API version: 3.0 * API version: 3.0
* WWW: http://www.glfw.org/ * WWW: http://www.glfw.org/
@ -127,15 +127,15 @@ extern "C" {
#if defined(_WIN32) && defined(GLFW_BUILD_DLL) #if defined(_WIN32) && defined(GLFW_BUILD_DLL)
/* We are building a Win32 DLL */ /* We are building a Win32 DLL */
#define GLFWAPI __declspec(dllexport) #define GLFWAPI __declspec(dllexport)
#elif defined(_WIN32) && defined(GLFW_DLL) #elif defined(_WIN32) && defined(GLFW_DLL)
/* We are calling a Win32 DLL */ /* We are calling a Win32 DLL */
#if defined(__LCC__) #if defined(__LCC__)
#define GLFWAPI extern #define GLFWAPI extern
#else #else
#define GLFWAPI __declspec(dllimport) #define GLFWAPI __declspec(dllimport)
#endif #endif
#else #else