build fix

Author: nesbox

.github/workflows/build.yml

@@ -416,7 +416,7 @@ jobs:
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r26e
+          ndk-version: r26d
           add-to-path: false
           local-cache: true
 

CMakeLists.txt

@@ -41,7 +41,7 @@ else()
     if(EMSCRIPTEN)
     elseif(APPLE) 
         set(LINKER_FLAGS_MINSIZEREL "-Wl,-dead_strip")
-    elseif(NOT MSVC)
+    elseif(MINGW)
         set(FLAGS_MINSIZEREL "-fno-function-sections -fno-data-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-exceptions")
         set(LINKER_FLAGS_MINSIZEREL "-Wl,-s -Wl,-Bsymbolic -Wl,--gc-sections")
     endif()

cmake/sokol.cmake

@@ -14,13 +14,6 @@ if(BUILD_SOKOL)
 
     if(APPLE)
         target_compile_definitions(sokol PRIVATE SOKOL_METAL)
-    elseif(WIN32)
-        target_compile_definitions(sokol PRIVATE SOKOL_D3D11 SOKOL_D3D11_SHADER_COMPILER)
-    elseif(LINUX)
-        target_compile_definitions(sokol PRIVATE SOKOL_GLCORE33)
-    endif()
-
-    if(APPLE)
         target_link_libraries(sokol
             "-framework Cocoa"
             "-framework QuartzCore"
@@ -29,13 +22,16 @@ if(BUILD_SOKOL)
             "-framework AudioToolbox"
         )
     elseif(WIN32)
-        target_link_libraries(sokol D3D11)
-
-        if(MINGW)
-            # target_link_libraries(sokol D3dcompiler_47)
-        endif()
+        target_compile_definitions(sokol PRIVATE SOKOL_D3D11)
+        target_link_libraries(sokol PRIVATE D3D11)
     elseif(LINUX)
-        target_link_libraries(sokol X11 GL m dl asound)
+        target_compile_definitions(sokol PRIVATE SOKOL_GLCORE33)
+        target_link_libraries(sokol PRIVATE X11 GL m dl asound)
+    elseif(ANDROID)
+        target_compile_definitions(sokol PRIVATE SOKOL_GLES3)
+        target_link_libraries(sokol PRIVATE android log aaudio EGL GLESv2 GLESv3)
+    elseif(EMSCRIPTEN)
+        target_compile_definitions(sokol PRIVATE SOKOL_GLCORE33)
     endif()
 
     target_include_directories(sokol PRIVATE ${THIRDPARTY_DIR}/sokol)

src/system/sokol/sokol.m

@@ -0,0 +1,25 @@
+// MIT License
+
+// Copyright (c) 2017 Vadim Grigoruk @nesbox // grigoruk@gmail.com
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#define SOKOL_IMPL
+
+#include "sokol.h"