mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-01 15:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/raysan5/raylib into develop

Browse Source
This commit is contained in:
Ray San
2017-11-30 16:59:13 +01:00
parent 9a7524661f 825d15b069
commit 25a232a6f3
3 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ include("../utils.cmake")
set(PROJECT_VERSION 1.9.1-dev)
set(RAYLIB raylib) # Name of the generated library
### Config options ###
# Shared library is always PIC. Static library should be PIC too if linked into a shared library
set(WITH_PIC OFF CACHE BOOL "Compile static library as position-independent code" OFF)
@@ -18,7 +17,6 @@ if(NOT (STATIC_RAYLIB OR SHARED_RAYLIB))
message(FATAL_ERROR "Nothing to do if both -DSHARED_RAYLIB=OFF and -DSTATIC_RAYLIB=OFF...")
endif()
# Platform
set(PLATFORM "Desktop" CACHE STRING "Platform to build for.")
set_property(CACHE PLATFORM PROPERTY STRINGS "Desktop" "Web" "Android" "Raspberry Pi")
@@ -26,8 +24,8 @@ set_property(CACHE PLATFORM PROPERTY STRINGS "Desktop" "Web" "Android" "Raspberr
# OpenGL version
set(OPENGL_VERSION "3.3" CACHE STRING "OpenGL Version to build raylib with")
set_property(CACHE OPENGL_VERSION PROPERTY STRINGS "3.3" "2.1" "1.1" "ES 2.0")
### Config options ###
### Config options ###
include_directories(external/glfw/include)
include_directories(external/openal/include) # For use with AppVeyor on Windows
@@ -55,6 +53,7 @@ if(${PLATFORM} MATCHES "Desktop")
elseif(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()
elseif(${PLATFORM} MATCHES "Web")
set(PLATFORM "PLATFORM_WEB")
set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
@@ -94,14 +93,20 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
foreach(L ${LIBS_PRIVATE})
set(PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE} -l${L}")
endforeach(L)
endif()
elseif(APPLE)
if(APPLE)
# TODO extract framework location and name from ${LIBS_PRIVATE}
# and specify them as -F and -framework instead of hardcoding
foreach(F OpenGL OpenAL Cocoa)
set(PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE} -framework ${F}")
endforeach(F)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
foreach(L ${LIBS_PRIVATE})
set(PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE} -l${L}")
endforeach(L)
endif()
if(${SHARED_RAYLIB})

17
src/rglfw.c
View File

@@ -36,6 +36,9 @@
#ifdef __linux__
#define _GLFW_X11
#endif
#ifdef __FreeBSD__
#define _GLFW_X11
#endif
#ifdef __APPLE__
#define _GLFW_COCOA
#define _GLFW_USE_CHDIR // To chdir to the Resources subdirectory of the application bundle during glfwInit
@@ -77,6 +80,20 @@
#include "external/glfw/src/osmesa_context.c"
#endif
#ifdef __FreeBSD__
#include "external/glfw/src/x11_init.c"
#include "external/glfw/src/x11_monitor.c"
#include "external/glfw/src/x11_window.c"
#include "external/glfw/src/xkb_unicode.c"
// TODO: Joistick implementation
#include "external/glfw/src/null_joystick.c"
#include "external/glfw/src/posix_time.c"
#include "external/glfw/src/posix_thread.c"
#include "external/glfw/src/glx_context.c"
#include "external/glfw/src/egl_context.c"
#include "external/glfw/src/osmesa_context.c"
#endif
#ifdef __APPLE__
#include "external/glfw/src/cocoa_init.m"
#include "external/glfw/src/cocoa_joystick.m"