Skip to content

Commit

Permalink
switch-imgui -> imgui-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
elnardu committed Aug 9, 2018
1 parent f78a219 commit 0bf6d95
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

#---------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions python_build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

0 comments on commit 0bf6d95

Please sign in to comment.