Skip to content

Commit e98d37a

Browse files
update pocketpy from v1.x to v2.0.1 (#2714)
* unchange python.c * add pkpy2 submodule * pyfunc not updated * added debug feature * [dev]boot returns emptyp * [dev]basic func finished * [dev]hello world enabled * [dev].. * [dev]all bind * [dev]add valueError * [dev]fix some bug * [dev]fix some bugs * [dev]all api test pass * [release].. * [release]pkpy update to v2 squashed commits of [dev] * [dev]core unchange * [dev]. * [dev]castfloat+core saved+exception raise * [dev]fixed mouse() * [dev]fixed mouse() alloc * [dev]delete tmp in mouse() * [dev]add assert, update pkpy.cmake * [dev]update pkpy submodule * some fix * fix IPO issue * fix time.c * fix time.c * fix time.c * fix time.c * [dev]assign none to retval() as default --------- Co-authored-by: BLUELOVETH <[email protected]>
1 parent 5e1b0ca commit e98d37a

File tree

4 files changed

+1049
-1331
lines changed

4 files changed

+1049
-1331
lines changed

.gitmodules

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
path = vendor/janet
6363
url = https://github.com/janet-lang/janet.git
6464
shallow = true
65-
[submodule "vendor/pocketpy"]
66-
path = vendor/pocketpy
67-
url = https://github.com/nesbox/pocketpy.git
68-
shallow = true
6965
[submodule "vendor/quickjs"]
7066
path = vendor/quickjs
7167
url = https://github.com/nesbox/quickjs.git
@@ -90,3 +86,6 @@
9086
path = vendor/sdl-gpu
9187
url = https://github.com/aliceisjustplaying/sdl-gpu.git
9288
branch = master
89+
[submodule "vendor/pocketpy"]
90+
path = vendor/pocketpy
91+
url = https://github.com/PrimedErwin/pocketpy.git

cmake/pocketpy.cmake

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44

55
option(BUILD_WITH_PYTHON "Python Enabled" ${BUILD_WITH_ALL})
66
message("BUILD_WITH_PYTHON: ${BUILD_WITH_PYTHON}")
7-
87
if(BUILD_WITH_PYTHON)
8+
option(PK_ENABLE_OS "" OFF)
9+
10+
if(NOT WIN32)
11+
option(PK_BUILD_WITH_IPO "" OFF)
12+
endif()
913

1014
add_subdirectory(${THIRDPARTY_DIR}/pocketpy)
1115

@@ -36,11 +40,4 @@ if(BUILD_WITH_PYTHON)
3640
)
3741

3842
target_link_libraries(python PRIVATE pocketpy)
39-
40-
if(EMSCRIPTEN)
41-
# exceptions must be enabled for emscripten
42-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fexceptions")
43-
endif()
44-
45-
4643
endif()

0 commit comments

Comments
 (0)