From f62ec815328bc4d02e23c9c3c4ec49335d1e53f8 Mon Sep 17 00:00:00 2001 From: pmp-p Date: Fri, 26 Jan 2024 14:00:26 +0100 Subject: [PATCH] change nanoX param and sdk packing --- scripts/cpython-build-emsdk-prebuilt.sh | 9 ++------- scripts/cpython-build-emsdk.sh | 1 + scripts/pack-sdk.sh | 1 + sources.wasm/microwindows.sh | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/cpython-build-emsdk-prebuilt.sh b/scripts/cpython-build-emsdk-prebuilt.sh index 884a016..33c0d55 100755 --- a/scripts/cpython-build-emsdk-prebuilt.sh +++ b/scripts/cpython-build-emsdk-prebuilt.sh @@ -95,13 +95,8 @@ pushd src fi cp -rf installer/src/installer ../prebuilt/emsdk/common/site-packages/ +popd +rm ${SDKROOT}/prebuilt/emsdk/common/site-packages/installer/_scripts/*exe - - - - - - -popd diff --git a/scripts/cpython-build-emsdk.sh b/scripts/cpython-build-emsdk.sh index b110ec1..a20e82f 100755 --- a/scripts/cpython-build-emsdk.sh +++ b/scripts/cpython-build-emsdk.sh @@ -412,5 +412,6 @@ do done + unset PYTHON_FOR_BUILD unset EMCC_CFLAGS diff --git a/scripts/pack-sdk.sh b/scripts/pack-sdk.sh index ee89fc5..43473ec 100644 --- a/scripts/pack-sdk.sh +++ b/scripts/pack-sdk.sh @@ -7,6 +7,7 @@ tar -cpPR \ ${SDKROOT}/python3-was? \ ${SDKROOT}/wasm32-*-shell.sh \ ${SDKROOT}/*sdk \ + ${SDKROOT}/scripts/*sdk-fetch.sh \ ${SDKROOT}/devices/* \ ${SDKROOT}/prebuilt/* \ > /tmp/sdk/python${PYBUILD}-wasm-sdk-${CIVER}.tar diff --git a/sources.wasm/microwindows.sh b/sources.wasm/microwindows.sh index 0c67733..c3de1cc 100755 --- a/sources.wasm/microwindows.sh +++ b/sources.wasm/microwindows.sh @@ -97,7 +97,7 @@ END # FIXME: use pkg config !!! EMCC_CFLAGS="-I${SDKROOT}/emsdk/upstream/emscripten/cache/sysroot/include/freetype2" \ - CC=emcc CXX=emc++ emmake make -C src NX11=Y NANOX=Y ARCH=EMSCRIPTEN LINK_APP_INTO_SERVER=Y NANOXDEMO=N + CC=emcc CXX=emc++ emmake make -C src NX11=Y NANOX=Y ARCH=EMSCRIPTEN LINK_APP_INTO_SERVER=Y NANOXDEMO=N ERASEMOVE=1 if [ -f /pp ]