blueloveTH 1 an în urmă
părinte
comite
881fbb01dd
2 a modificat fișierele cu 5 adăugiri și 28 ștergeri
  1. 1 21
      CMakeLists.txt
  2. 4 7
      build_ios.sh

+ 1 - 21
CMakeLists.txt

@@ -49,27 +49,7 @@ endif()
 if(PK_BUILD_SHARED_LIB)
 if(PK_BUILD_SHARED_LIB)
     add_library(${PROJECT_NAME} SHARED ${POCKETPY_SRC})
     add_library(${PROJECT_NAME} SHARED ${POCKETPY_SRC})
 elseif(PK_BUILD_STATIC_LIB)
 elseif(PK_BUILD_STATIC_LIB)
-    if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
-        set(
-            HEADERS
-            ${CMAKE_CURRENT_LIST_DIR}/include/pocketpy/pocketpy_c.h
-            ${CMAKE_CURRENT_LIST_DIR}/include/pocketpy/export.h
-        )
-        add_library(${PROJECT_NAME} STATIC ${POCKETPY_SRC} ${HEADERS})
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            FRAMEWORK TRUE
-            MACOSX_FRAMEWORK_IDENTIFIER dev.pocketpy
-            # MACOSX_FRAMEWORK_INFO_PLIST Info.plist
-            # "current version" in semantic format in Mach-O binary file
-            VERSION 1.4.3
-            # "compatibility version" in semantic format in Mach-O binary file
-            SOVERSION 1.4.3
-            PUBLIC_HEADER "${HEADERS}"
-            XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer"
-        )
-    else()
-        add_library(${PROJECT_NAME} STATIC ${POCKETPY_SRC})
-    endif()
+    add_library(${PROJECT_NAME} STATIC ${POCKETPY_SRC})
 else()
 else()
     add_library(${PROJECT_NAME} SHARED ${POCKETPY_SRC})
     add_library(${PROJECT_NAME} SHARED ${POCKETPY_SRC})
     set(PROJECT_EXE_NAME main)
     set(PROJECT_EXE_NAME main)

+ 4 - 7
build_ios.sh

@@ -7,15 +7,12 @@ FLAGS="-DCMAKE_TOOLCHAIN_FILE=~/ios-cmake/ios.toolchain.cmake -DPK_BUILD_STATIC_
 cmake -B os64 -G Xcode $FLAGS -DPLATFORM=OS64 ..
 cmake -B os64 -G Xcode $FLAGS -DPLATFORM=OS64 ..
 cmake --build os64 --config Release
 cmake --build os64 --config Release
 
 
-cmake -B simulator64 -G Xcode $FLAGS -DPLATFORM=SIMULATOR64 ..
-cmake --build simulator64 --config Release
-
-# cmake -B simulatorarm64 -G Xcode $FLAGS -DPLATFORM=SIMULATORARM64 ..
-# cmake --build simulatorarm64 --config Release
+cmake -B simulatorarm64 -G Xcode $FLAGS -DPLATFORM=SIMULATORARM64 ..
+cmake --build simulatorarm64 --config Release
 
 
 xcodebuild -create-xcframework \
 xcodebuild -create-xcframework \
-    -framework os64/Release-iphoneos/pocketpy.framework \
-    -framework simulator64/Release-iphonesimulator/pocketpy.framework \
+    -library os64/Release-iphoneos/libpocketpy.a -headers ../include \
+    -library simulatorarm64/Release-iphonesimulator/libpocketpy.a -headers ../include \
     -output pocketpy.xcframework
     -output pocketpy.xcframework