diff --git a/.gitignore b/.gitignore index 974c849..c214272 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ python_build/* !python_build/Makefile build/ PyNX.* +.DS_Store diff --git a/Makefile b/Makefile index f3426e6..57333fd 100644 --- a/Makefile +++ b/Makefile @@ -147,6 +147,7 @@ dist: $(BUILD) unzip $(PY_BUILD)/nxpy3.5.3/python.zip -d $(LIBDIR) cp -r $(PY_BUILD)/nx-*/nx $(LIBDIR) cp -r $(PY_BUILD)/imgui-switch-*/dist/python/* $(LIBDIR) + cp -r python_exts/py_libs/* $(LIBDIR) cp $(OUTPUT).nro $(DIST_DIR)/ cp $(OUTPUT).nacp $(DIST_DIR)/ cp main.py $(DIST_DIR)/ diff --git a/python_build/Makefile b/python_build/Makefile index 74bee60..f04a5ac 100644 --- a/python_build/Makefile +++ b/python_build/Makefile @@ -38,6 +38,7 @@ else endif PYCONFIG_DIR := ../python_config +PY_EXT_DIR := ../python_exts LIBDIRS := $(PORTLIBS) $(LIBNX) export INCLUDE := $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ @@ -135,6 +136,8 @@ patchPY: cloneNX extractedPY cp $(PYDIR)/Modules/Setup.dist $(PYDIR)/Modules/Setup.dist_old cat $(PYDIR)/Modules/Setup.dist_old | $(SED) -e '$$a_nx -I$$(srcdir)/Modules/_nx _nx/_nxmodule.c hashtable.c' | $(SED) 's/^\([^#].* pwdmodule\.c.*\)/#\1/' | $(SED) 's/^#\(array\|cmath\|math\|_struct\|operator\|_random\|_collections\|itertools\|signal\|strop\|unicodedata\|_io\|_csv\|_md5\|_sha\|_sha256\|_sha512\|binascii\|select\|cStringIO\|time\|_functools\|_socket\|datetime\|_bisect\|zlib\)\(.*\)/\1\2/' | $(SED) "s#\\(zlib[^\$$]*\\)\$$(prefix)\\([^\$$]*\\)\$$(exec_prefix)\\(.*\\)#\1$(DEVKITPRO)/portlibs/switch\2$(DEVKITPRO)/portlibs/switch\3#" | $(SED) "s/_tracemalloc/# _tracemalloc/" >$(PYDIR)/Modules/Setup.dist cat imgui-switch-*/setup.txt >> $(PYDIR)/Modules/Setup.dist + cp -r $(TOPDIR)/python_exts/c_files/. $(TOPDIR)/python_build/$(PYDIR)/Modules/ + cat $(TOPDIR)/python_exts/setup/* >>$(TOPDIR)/python_build/$(PYDIR)/Modules/Setup.dist cp -r _nx-*/_nx $(PYDIR)/Modules/ cp -r imgui-switch-*/dist/modules/* $(PYDIR)/Modules/ diff --git a/python_exts/c_files/.gitkeep b/python_exts/c_files/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/python_exts/py_libs/.gitkeep b/python_exts/py_libs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/python_exts/setup/.gitkeep b/python_exts/setup/.gitkeep new file mode 100644 index 0000000..e69de29