this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move libGL to proper location (as hard-coded in SDL)

+15 -4
+1 -1
cmake/use_ld64.cmake
··· 55 55 -Wl,-dylib_file,/usr/lib/libbz2.1.0.dylib:${CMAKE_BINARY_DIR}/src/external/bzip2/libbz2.1.0.dylib \ 56 56 -Wl,-dylib_file,/usr/lib/libssl.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libssl.0.9.8.dylib \ 57 57 -Wl,-dylib_file,/usr/lib/libcrypto.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libcrypto.0.9.8.dylib \ 58 - -Wl,-dylib_file,/usr/lib/native/libGL.dylib:${CMAKE_BINARY_DIR}/src/native/libGL.dylib \ 58 + -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:${CMAKE_BINARY_DIR}/src/native/libGL.dylib \ 59 59 -Wl,-dylib_file,/System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage:${CMAKE_BINARY_DIR}/src/frameworks/CoreImage/CoreImage \ 60 60 -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents:${CMAKE_BINARY_DIR}/src/frameworks/CoreServices/FSEvents \ 61 61 -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices:${CMAKE_BINARY_DIR}/src/frameworks/CoreServices/LaunchServices \
+8 -2
cmake/wrap_elf.cmake
··· 13 13 wrapgen 14 14 ) 15 15 16 - set(DYLIB_INSTALL_NAME "/usr/lib/native/lib${name}.dylib") 16 + if (ARGC LESS 3) 17 + set(destination "/usr/lib/native") 18 + else (ARGC LESS 3) 19 + set(destination ${ARGV2}) 20 + endif (ARGC LESS 3) 21 + 22 + set(DYLIB_INSTALL_NAME "${destination}/lib${name}.dylib") 17 23 include_directories(${CMAKE_SOURCE_DIR}/src/libelfloader/native) 18 24 add_darling_library(${name} SHARED ${CMAKE_CURRENT_BINARY_DIR}/${name}.c) 19 25 target_link_libraries(${name} PRIVATE system elfloader) 20 26 make_fat(${name}) 21 - install(TARGETS ${name} DESTINATION libexec/darling/usr/lib/native) 27 + install(TARGETS ${name} DESTINATION libexec/darling/${destination}) 22 28 endfunction(wrap_elf) 23 29
+6 -1
src/native/CMakeLists.txt
··· 7 7 wrap_elf(png libpng.so) 8 8 wrap_elf(tiff libtiff.so) 9 9 wrap_elf(X11 libX11.so) 10 + wrap_elf(Xext libXext.so) 10 11 wrap_elf(XRandR libXrandr.so) 11 12 wrap_elf(Xcursor libXcursor.so) 12 13 wrap_elf(cairo libcairo.so) 13 - wrap_elf(GL libGL.so) 14 14 wrap_elf(EGL libEGL.so) 15 15 wrap_elf(fontconfig libfontconfig.so) 16 + 17 + 18 + wrap_elf(GL libGL.so "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries") 19 + InstallSymlink(Versions/Current/Libraries 20 + "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/Frameworks/OpenGL.framework/Libraries")