mirror of
https://github.com/raysan5/raylib.git
synced 2026-08-26 00:51:36 +00:00
Update GLFW to 3.5.1 (#6051)
* Update GLFW to 3.5.1 * Remove cocoa_time.c from rglfw.c * Add macos_time.c to rglfw.c * Redo changes from pull request #3863 * Makefile: add QuartzCore framework when building for macOS * Add QuartzCore when building for macOS to other build files * Remove unused GLFW dependencies
This commit is contained in:
committed by
GitHub
parent
fba8ea01f5
commit
77353e7f31
@@ -38,4 +38,5 @@ if (APPLE)
|
||||
target_link_libraries(${PROJECT_NAME} "-framework IOKit")
|
||||
target_link_libraries(${PROJECT_NAME} "-framework Cocoa")
|
||||
target_link_libraries(${PROJECT_NAME} "-framework OpenGL")
|
||||
target_link_libraries(${PROJECT_NAME} "-framework QuartzCore")
|
||||
endif()
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
<Add option="-framework IOKit" />
|
||||
<Add option="-framework CoreAudio" />
|
||||
<Add option="-framework CoreVideo" />
|
||||
<Add option="-framework QuartzCore" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release (Mac)">
|
||||
@@ -44,6 +45,7 @@
|
||||
<Add option="-framework IOKit" />
|
||||
<Add option="-framework CoreAudio" />
|
||||
<Add option="-framework CoreVideo" />
|
||||
<Add option="-framework QuartzCore" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Debug (Linux)">
|
||||
|
||||
@@ -321,7 +321,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
||||
ifeq ($(PLATFORM_OS),OSX)
|
||||
# Libraries for OSX 10.9 desktop compiling
|
||||
# NOTE: Required packages: libopenal-dev libegl1-mesa-dev
|
||||
LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa -framework IOKit
|
||||
LDLIBS = -lraylib -framework OpenGL -framework OpenAL -framework Cocoa -framework IOKit -framework QuartzCore
|
||||
endif
|
||||
ifeq ($(PLATFORM_OS),BSD)
|
||||
# Libraries for FreeBSD, OpenBSD, NetBSD, DragonFly desktop compiling
|
||||
|
||||
@@ -89,13 +89,13 @@ OUTPUT_DIR="builds/osx"
|
||||
COMPILATION_FLAGS="-std=c99 -O2 -flto"
|
||||
FINAL_COMPILE_FLAGS="-s"
|
||||
WARNING_FLAGS="-Wall -Wextra -Wpedantic"
|
||||
LINK_FLAGS="-flto -framework OpenGL -framework OpenAL -framework IOKit -framework CoreVideo -framework Cocoa"
|
||||
LINK_FLAGS="-flto -framework OpenGL -framework OpenAL -framework IOKit -framework CoreVideo -framework Cocoa -framework QuartzCore"
|
||||
# Debug changes to flags
|
||||
if [ -n "$BUILD_DEBUG" ]; then
|
||||
OUTPUT_DIR="builds-debug/osx"
|
||||
COMPILATION_FLAGS="-std=c99 -O0 -g"
|
||||
FINAL_COMPILE_FLAGS=""
|
||||
LINK_FLAGS="-framework OpenGL -framework OpenAL -framework IOKit -framework CoreVideo -framework Cocoa"
|
||||
LINK_FLAGS="-framework OpenGL -framework OpenAL -framework IOKit -framework CoreVideo -framework Cocoa -framework QuartzCore"
|
||||
fi
|
||||
|
||||
# Display what we're doing
|
||||
|
||||
Reference in New Issue
Block a user