CMakeLists.txt

@@ -5,19 +5,6 @@ project(pocketpy)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
-# use IPO
-include(CheckIPOSupported)
-check_ipo_supported(RESULT result)
-
-if(result AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-else()
-    message(WARNING ">> IPO disabled. You will get very poor performance!!")
-    message(WARNING ">> IPO disabled. You will get very poor performance!!")
-    message(WARNING ">> IPO disabled. You will get very poor performance!!")
-endif()
-
-
 if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /jumptablerdata /GS-")
     add_compile_options(/wd4267 /wd4244)

amalgamate.py

@@ -8,7 +8,7 @@ from typing import List, Dict
 assert os.system("python prebuild.py") == 0
 
 ROOT = 'include/pocketpy'
-PUBLIC_HEADERS = ['config.h', 'export.h', 'pocketpy.h']
+PUBLIC_HEADERS = ['common/config.h', 'common/export.h', 'pocketpy.h']
 
 COPYRIGHT = '''/*
  *  Copyright (c) 2024 blueloveTH

build_ios.sh

@@ -1,7 +1,5 @@
 set -e
 
-python amalgamate.py
-
 rm -rf build
 mkdir build
 cd build
@@ -14,11 +12,9 @@ cmake --build os64 --config Release
 cmake -B simulatorarm64 -G Xcode $FLAGS -DPLATFORM=SIMULATORARM64 ..
 cmake --build simulatorarm64 --config Release
 
-HEADERS="../amalgamated/pocketpy.h"
-
 xcodebuild -create-xcframework \
-    -library os64/Release-iphoneos/libpocketpy.a -headers $HEADERS \
+    -library os64/Release-iphoneos/libpocketpy.a -headers ../include/pocketpy/pocketpy.h \
-    -library simulatorarm64/Release-iphonesimulator/libpocketpy.a -headers $HEADERS \
+    -library simulatorarm64/Release-iphonesimulator/libpocketpy.a -headers ../include/pocketpy/pocketpy.h \
     -output pocketpy.xcframework
 
 

include/pocketpy/common/config.h

@@ -31,6 +31,10 @@
 #define PK_DEBUG_GC_STATS           0
 #define PK_DEBUG_COMPILER           0
 
+#ifndef PK_DEBUG_PRECOMPILED_EXEC
+#define PK_DEBUG_PRECOMPILED_EXEC   0
+#endif
+
 /*************** internal settings ***************/
 
 // This is the maximum size of the value stack in py_TValue units

include/pocketpy/pocketpy.h

@@ -5,8 +5,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
-#include "pocketpy/export.h"
+#include "pocketpy/common/export.h"
 
 #ifdef __cplusplus
 extern "C" {