Fixed the artefacts generation

tanis2000 · Jul 23, 2024 · 0e8fe5e · 0e8fe5e
1 parent 000440b
commit 0e8fe5e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -94,7 +94,7 @@ jobs:
         run: |
           cp -v ./src/binocle/core/*.h ./build/${{ env.RELEASE_NAME }}/include
           cp -v ./src/binocle/core/backend/*.h ./build/${{ env.RELEASE_NAME }}/include/backend
-          cp -v ./build/src/libbinocle-static.a ./build/${{ env.RELEASE_NAME }}/lib
+          cp -v ./build/src/${{env.BUILD_TYPE}}-iphoneos/libbinocle-static.a ./build/${{ env.RELEASE_NAME }}/lib
           cd build
           tar -czvf ${{ env.RELEASE_NAME }}.tar.gz ${{ env.RELEASE_NAME }}
 

diff --git a/cmake/BinocleWatchOS.cmake b/cmake/BinocleWatchOS.cmake
@@ -3,12 +3,13 @@
 set (CMAKE_SYSTEM_NAME watchOS)
 
 add_definitions (-DWATCHOS -D__WATCHOS__)
-#add_definitions (-DBINOCLE_METAL)
-#set(BINOCLE_METAL true)
+# watchOS supports Metal only. Do not try to use OpenGL
+add_definitions (-DBINOCLE_METAL)
+set(BINOCLE_METAL true)
 
-add_definitions (-DBINOCLE_GL)
-set(BINOCLE_GL true)
-add_definitions (-DBINOCLE_GLES2)
+#add_definitions (-DBINOCLE_GL)
+#set(BINOCLE_GL true)
+#add_definitions (-DBINOCLE_GLES2)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG")
@@ -35,11 +36,11 @@ set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-watchos;-watchsimulator")
 set (CMAKE_CONFIGURATION_TYPES Debug Release)
 
 if(NOT BINOCLE_WATCHOS_SDK)
-    # Set Base SDK to "Latest iOS" for the device
+    # Set Base SDK to "Latest watchOS" for the device
     set (BINOCLE_WATCHOS_SDK "watchos")
 endif()
 
-# Obtain iOS sysroot path
+# Obtain watchOS sysroot path
 execute_process (COMMAND "xcodebuild" -version -sdk ${BINOCLE_WATCHOS_SDK} Path
         OUTPUT_VARIABLE WATCHOS_SYSROOT
         OUTPUT_STRIP_TRAILING_WHITESPACE

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,7 +19,7 @@ set(BINOCLE_STATIC_LIBS
         $<TARGET_OBJECTS:wren>
         )
 
-if (NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS AND BINOCLE_HTTP)
+if (NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS AND NOT WATCHOS AND BINOCLE_HTTP)
     find_package(OpenSSL REQUIRED)
     set(OPENSSL_USE_STATIC_LIBS true)
 endif ()
@@ -38,7 +38,7 @@ else()
             )
 endif()
 
-if (APPLE AND NOT IOS)
+if (APPLE AND NOT IOS AND NOT WATCHOS)
     set(BINOCLE_STATIC_LIBS ${BINOCLE_STATIC_LIBS}
             $<TARGET_OBJECTS:glew>
             # we're using lua instead of luajit on macos to be able to test with valgrind