From 0bf6d95ce4d8a66e3d26f5d04f7f984e237aee28 Mon Sep 17 00:00:00 2001 From: elnardu Date: Thu, 9 Aug 2018 23:05:29 +0600 Subject: [PATCH] switch-imgui -> imgui-switch --- Makefile | 4 ++-- python_build/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a16630..443846b 100644 --- a/Makefile +++ b/Makefile @@ -146,10 +146,10 @@ dist: $(BUILD) mkdir -p $(LIBDIR) unzip $(PY_BUILD)/nxpy3.5.3/python.zip -d $(LIBDIR) cp -r $(PY_BUILD)/nx-*/nx $(LIBDIR) - cp -r $(PY_BUILD)/switch-imgui-*/dist/python/* $(LIBDIR) + cp -r $(PY_BUILD)/imgui-switch-*/dist/python/* $(LIBDIR) cp $(OUTPUT).nro $(DIST_DIR)/ cp $(OUTPUT).nacp $(DIST_DIR)/ - cp $(PY_BUILD)/switch-imgui-*/main.py $(DIST_DIR)/ + cp $(PY_BUILD)/imgui-switch-*/main.py $(DIST_DIR)/ cd $(BUILD) && zip -r $(TARGET)-$(APP_VERSION).zip $(TARGET) #--------------------------------------------------------------------------------- diff --git a/python_build/Makefile b/python_build/Makefile index 0aa970d..adb4b01 100644 --- a/python_build/Makefile +++ b/python_build/Makefile @@ -134,9 +134,9 @@ patchPY: cloneNX extractedPY echo ac_cv_lib_dl_dlopen=no >>$(PYDIR)/config.site 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 switch-imgui-*/setup.txt >> $(PYDIR)/Modules/Setup.dist + cat imgui-switch-*/setup.txt >> $(PYDIR)/Modules/Setup.dist cp -r _nx-*/_nx $(PYDIR)/Modules/ - cp -r switch-imgui-*/dist/modules/* $(PYDIR)/Modules/ + cp -r imgui-switch-*/dist/modules/* $(PYDIR)/Modules/ touch patchPY @@ -147,4 +147,4 @@ $(PYFILE): wget -O "$(PYFILE)" "$(PYLINK)" || curl -Lo "$(PYFILE)" "$(PYLINK)" clean: - @rm -rf $(PYDIR) $(PYFILE) $(_NXFILE) $(NXFILE) patchPY extractedPY compilePY linkPY distfPY soospatchPY cloneNX _nx-* nx-* switch-imgui-* libpython*.a + @rm -rf $(PYDIR) $(PYFILE) $(_NXFILE) $(NXFILE) patchPY extractedPY compilePY linkPY distfPY soospatchPY cloneNX _nx-* nx-* imgui-switch-* libpython*.a