koffi 2.1.1 → 2.1.2

package/vendor/raylib/cmake/LibraryConfigurations.cmake

@@ -1,6 +1,6 @@
 if (${PLATFORM} MATCHES "Desktop")
     set(PLATFORM_CPP "PLATFORM_DESKTOP")
-    
+
     if (APPLE)
         # Need to force OpenGL 3.3 on OS X
         # See: https://github.com/raysan5/raylib/issues/341
@@ -22,12 +22,16 @@ if (${PLATFORM} MATCHES "Desktop")
         if ("${OPENGL_LIBRARIES}" STREQUAL "")
             set(OPENGL_LIBRARIES "GL")
         endif ()
-        
+
         if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD")
             find_library(OSS_LIBRARY ossaudio)
         endif ()
-        
-        set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+
+        set(LIBS_PRIVATE m atomic pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+
+        if (USE_AUDIO)
+            set(LIBS_PRIVATE ${LIBS_PRIVATE} dl)
+        endif ()
     endif ()
 
 elseif (${PLATFORM} MATCHES "Web")
@@ -40,20 +44,20 @@ elseif (${PLATFORM} MATCHES "Android")
     set(PLATFORM_CPP "PLATFORM_ANDROID")
     set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    
+    list(APPEND raylib_sources ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
     add_definitions(-DANDROID -D__ANDROID_API__=21)
-    include_directories(external/android/native_app_glue)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libatomic.a -Wl,--build-id -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel -Wl,--fatal-warnings -uANativeActivity_onCreate")
-    
+    include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libatomic.a -Wl,--build-id -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel -Wl,--fatal-warnings -u ANativeActivity_onCreate -Wl,-undefined,dynamic_lookup")
+
     find_library(OPENGL_LIBRARY OpenGL)
     set(LIBS_PRIVATE m log android EGL GLESv2 OpenSLES atomic c)
 
 elseif (${PLATFORM} MATCHES "Raspberry Pi")
     set(PLATFORM_CPP "PLATFORM_RPI")
     set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
-    
+
     add_definitions(-D_DEFAULT_SOURCE)
-    
+
     find_library(GLESV2 brcmGLESv2 HINTS /opt/vc/lib)
     find_library(EGL brcmEGL HINTS /opt/vc/lib)
     find_library(BCMHOST bcm_host HINTS /opt/vc/lib)
@@ -61,29 +65,31 @@ elseif (${PLATFORM} MATCHES "Raspberry Pi")
     link_directories(/opt/vc/lib)
     set(LIBS_PRIVATE ${GLESV2} ${EGL} ${BCMHOST} pthread rt m dl)
 
-elseif (${PLATFORM} MATCHES "DRM")
+elseif ("${PLATFORM}" MATCHES "DRM")
     set(PLATFORM_CPP "PLATFORM_DRM")
     set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
-    
+
     add_definitions(-D_DEFAULT_SOURCE)
     add_definitions(-DEGL_NO_X11)
     add_definitions(-DPLATFORM_DRM)
-    
+
     find_library(GLESV2 GLESv2)
     find_library(EGL EGL)
     find_library(DRM drm)
     find_library(GBM gbm)
-    
+
     if (NOT CMAKE_CROSSCOMPILING)
         include_directories(/usr/include/libdrm)
     endif ()
-    set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} pthread m dl)
+    set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread m dl)
 
 endif ()
 
 if (${OPENGL_VERSION})
     set(${SUGGESTED_GRAPHICS} "${GRAPHICS}")
-    if (${OPENGL_VERSION} MATCHES "3.3")
+    if (${OPENGL_VERSION} MATCHES "4.3")
+		set(GRAPHICS "GRAPHICS_API_OPENGL_43")
+    elseif (${OPENGL_VERSION} MATCHES "3.3")
         set(GRAPHICS "GRAPHICS_API_OPENGL_33")
     elseif (${OPENGL_VERSION} MATCHES "2.1")
         set(GRAPHICS "GRAPHICS_API_OPENGL_21")

package/vendor/raylib/cmake/raylib-config.cmake

@@ -11,66 +11,69 @@
 #   raylib_LDFLAGS - The linker flags needed with raylib
 #   raylib_DEFINITIONS - Compiler switches required for using raylib
 
-set(XPREFIX PC_RAYLIB)
+if (NOT TARGET raylib)
+    set(XPREFIX PC_RAYLIB)
 
-find_package(PkgConfig QUIET)
-pkg_check_modules(${XPREFIX} QUIET raylib)
+    find_package(PkgConfig QUIET)
+    pkg_check_modules(${XPREFIX} QUIET raylib)
 
-if (raylib_USE_STATIC_LIBS)
-    set(XPREFIX ${XPREFIX}_STATIC)
-endif()
+    if (raylib_USE_STATIC_LIBS)
+        set(XPREFIX ${XPREFIX}_STATIC)
+    endif()
 
-set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
+    set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
 
-find_path(raylib_INCLUDE_DIR
-    NAMES raylib.h
-    HINTS ${${XPREFIX}_INCLUDE_DIRS}
-)
+    find_path(raylib_INCLUDE_DIR
+        NAMES raylib.h
+        HINTS ${${XPREFIX}_INCLUDE_DIRS}
+    )
 
-set(RAYLIB_NAMES raylib)
+    set(RAYLIB_NAMES raylib)
 
-if (raylib_USE_STATIC_LIBS)
-    set(RAYLIB_NAMES libraylib.a raylib.lib ${RAYLIB_NAMES})
-endif()
+    if (raylib_USE_STATIC_LIBS)
+        set(RAYLIB_NAMES libraylib.a raylib.lib ${RAYLIB_NAMES})
+    endif()
 
-find_library(raylib_LIBRARY
-    NAMES ${RAYLIB_NAMES}
-    HINTS ${${XPREFIX}_LIBRARY_DIRS}
-)
+    find_library(raylib_LIBRARY
+        NAMES ${RAYLIB_NAMES}
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
 
-set(raylib_LIBRARIES    ${raylib_LIBRARY})
-set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
-set(raylib_LIBRARY_DIR  ${raylib_LIBRARY_DIRS})
-set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR})
-set(raylib_LDFLAGS      ${${XPREFIX}_LDFLAGS})
+    set(raylib_LIBRARIES    ${raylib_LIBRARY})
+    set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
+    set(raylib_LIBRARY_DIR  ${raylib_LIBRARY_DIRS})
+    set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR})
+    set(raylib_LDFLAGS      ${${XPREFIX}_LDFLAGS})
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(raylib DEFAULT_MSG
-    raylib_LIBRARY
-    raylib_INCLUDE_DIR
-)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(raylib DEFAULT_MSG
+        raylib_LIBRARY
+        raylib_INCLUDE_DIR
+    )
 
-mark_as_advanced(raylib_LIBRARY raylib_INCLUDE_DIR)
+    mark_as_advanced(raylib_LIBRARY raylib_INCLUDE_DIR)
 
-if (raylib_USE_STATIC_LIBS)
-  add_library(raylib STATIC IMPORTED GLOBAL)
-else()
-  add_library(raylib SHARED IMPORTED GLOBAL)
-endif()
-string (REPLACE ";" " " raylib_LDFLAGS "${raylib_LDFLAGS}")
+    if (raylib_USE_STATIC_LIBS)
+      add_library(raylib STATIC IMPORTED GLOBAL)
+    else()
+      add_library(raylib SHARED IMPORTED GLOBAL)
+    endif()
+    string (REPLACE ";" " " raylib_LDFLAGS "${raylib_LDFLAGS}")
 
-set_target_properties(raylib
-  PROPERTIES
-  IMPORTED_LOCATION             "${raylib_LIBRARIES}"
-  INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}"
-  INTERFACE_LINK_LIBRARIES      "${raylib_LDFLAGS}"
-  INTERFACE_COMPILE_OPTIONS     "${raylib_DEFINITIONS}"
-)
+    set_target_properties(raylib
+      PROPERTIES
+      IMPORTED_LOCATION             "${raylib_LIBRARIES}"
+      IMPORTED_IMPLIB               "${raylib_LIBRARIES}"
+      INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES      "${raylib_LDFLAGS}"
+      INTERFACE_COMPILE_OPTIONS     "${raylib_DEFINITIONS}"
+    )
 
-if (raylib_VERBOSE)
-  message(STATUS "raylib_FOUND: ${raylib_FOUND}")
-  message(STATUS "raylib_INCLUDE_DIRS: ${raylib_INCLUDE_DIRS}")
-  message(STATUS "raylib_LIBRARIES: ${raylib_LIBRARIES}")
-  message(STATUS "raylib_LDFLAGS: ${raylib_LDFLAGS}")
-  message(STATUS "raylib_DEFINITIONS: ${raylib_DEFINITIONS}")
+    if (raylib_VERBOSE)
+      message(STATUS "raylib_FOUND: ${raylib_FOUND}")
+      message(STATUS "raylib_INCLUDE_DIRS: ${raylib_INCLUDE_DIRS}")
+      message(STATUS "raylib_LIBRARIES: ${raylib_LIBRARIES}")
+      message(STATUS "raylib_LDFLAGS: ${raylib_LDFLAGS}")
+      message(STATUS "raylib_DEFINITIONS: ${raylib_DEFINITIONS}")
+    endif()
 endif()

package/vendor/raylib/examples/CMakeLists.txt

@@ -52,7 +52,7 @@ foreach (example_dir ${example_dirs})
     # Get the .c files
     file(GLOB sources ${example_dir}/*.c)
     list(APPEND example_sources ${sources})
-    
+
     # Any any resources
     file(GLOB resources ${example_dir}/resources/*)
     list(APPEND example_resources ${resources})
@@ -71,7 +71,7 @@ if (${PLATFORM} MATCHES "Android")
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_3d_camera_free.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_3d_camera_first_person.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_world_screen.c)
-    
+
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_mesh_picking.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_cubicmap.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_skybox.c)
@@ -86,8 +86,8 @@ if (${PLATFORM} MATCHES "Android")
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_animation.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_first_person_maze.c)
 	list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_magicavoxel_loading.c)
-    
-	
+
+
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_custom_uniform.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_model_shader.c)
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_postprocessing.c)
@@ -101,11 +101,16 @@ elseif (${PLATFORM} MATCHES "Web")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s ALLOW_MEMORY_GROWTH=1 --no-heap-copy")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --shell-file ${CMAKE_SOURCE_DIR}/src/shell.html")
     set(CMAKE_EXECUTABLE_SUFFIX ".html")
-    
+
     # Remove the -rdynamic flag because otherwise emscripten
     # does not generate HTML+JS+WASM files, only a non-working
     # and fat HTML
     string(REPLACE "-rdynamic" "" CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}")
+
+elseif ("${PLATFORM}" STREQUAL "DRM")
+    list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/rlgl_standalone.c)
+    list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/raylib_opengl_interop.c)
+
 endif ()
 
 include_directories(BEFORE SYSTEM others/external/include)
@@ -119,15 +124,15 @@ foreach (example_source ${example_sources})
     # Create the basename for the example
     get_filename_component(example_name ${example_source} NAME)
     string(REPLACE ".c" "" example_name ${example_name})
-    
+
     # Setup the example
     add_executable(${example_name} ${example_source})
-    
+
     target_link_libraries(${example_name} raylib)
-    
+
     string(REGEX MATCH ".*/.*/" resources_dir ${example_source})
     string(APPEND resources_dir "resources")
-    
+
     if (${PLATFORM} MATCHES "Web" AND EXISTS ${resources_dir})
         # The local resources path needs to be mapped to /resources virtual path
         string(APPEND resources_dir "@resources")