Skip to content

Commit

Permalink
update pocketpy from v1.x to v2.0.1 (#2714)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
PrimedErwin and blueloveTH authored Nov 11, 2024
1 parent 5e1b0ca commit e98d37a
Show file tree
Hide file tree
Showing 4 changed files with 1,049 additions and 1,331 deletions.
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@
path = vendor/janet
url = https://github.com/janet-lang/janet.git
shallow = true
[submodule "vendor/pocketpy"]
path = vendor/pocketpy
url = https://github.com/nesbox/pocketpy.git
shallow = true
[submodule "vendor/quickjs"]
path = vendor/quickjs
url = https://github.com/nesbox/quickjs.git
Expand All @@ -90,3 +86,6 @@
path = vendor/sdl-gpu
url = https://github.com/aliceisjustplaying/sdl-gpu.git
branch = master
[submodule "vendor/pocketpy"]
path = vendor/pocketpy
url = https://github.com/PrimedErwin/pocketpy.git
13 changes: 5 additions & 8 deletions cmake/pocketpy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

option(BUILD_WITH_PYTHON "Python Enabled" ${BUILD_WITH_ALL})
message("BUILD_WITH_PYTHON: ${BUILD_WITH_PYTHON}")

if(BUILD_WITH_PYTHON)
option(PK_ENABLE_OS "" OFF)

if(NOT WIN32)
option(PK_BUILD_WITH_IPO "" OFF)
endif()

add_subdirectory(${THIRDPARTY_DIR}/pocketpy)

Expand Down Expand Up @@ -36,11 +40,4 @@ if(BUILD_WITH_PYTHON)
)

target_link_libraries(python PRIVATE pocketpy)

if(EMSCRIPTEN)
# exceptions must be enabled for emscripten
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fexceptions")
endif()


endif()
Loading

0 comments on commit e98d37a

Please sign in to comment.