Skip to content

Commit

Permalink
Minor Makefile fixes again
Browse files Browse the repository at this point in the history
  • Loading branch information
XorTroll committed Jul 4, 2024
1 parent 6bf5326 commit 729f56a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ umenu: arc pu
@cp projects/uMenu/uMenu.nso SdOut/ulaunch/bin/uMenu/main
@cp projects/uMenu/uMenu.npdm SdOut/ulaunch/bin/uMenu/main.npdm
@cp assets/Logo.png projects/uMenu/romfs/Logo.png
@rm -rf projects/uMenu/romfs/default
@cp -r default-theme/ projects/uMenu/romfs/default/
@cp projects/uMenu/romfs/Logo.png projects/uDesigner/assets/Logo.png
@build_romfs projects/uMenu/romfs SdOut/ulaunch/bin/uMenu/romfs.bin
Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
- [uMenu](#umenu)
- [uLoader](#uloader)
- [uManager](#umanager)
- [uScreen](#uscreen)
- [uDesigner](#udesigner)
- [Building](#building)
- [Credits](#credits)

Expand Down Expand Up @@ -255,6 +257,14 @@ uManager is a homebrew NRO used for controlling key uLaunch aspects.

Only those tasks which cannot be performed outside uLaunch are controlled (like enabling or disabling uLaunch itself, hence why this is a separate NRO and not part of uMenu/etc), while everything else is controlled and managed on uLaunch itself.

### uScreen

uScreen is a PC tool that communicates via USB with uSystem in order to capture the screen.

### uDesigner

uDesigner is an (experimental) [web theme editor](https://github.com/XorTroll/uLaunch/wiki) to make themeing more easier.

## Building

> Note that [workflows](https://github.com/XorTroll/uLaunch/actions) automatically build and upload nightly builds for every commit!
Expand All @@ -265,7 +275,7 @@ You will need *devkitPro*, *devkitA64*, *libnx* and all SDL2 libraries for Switc

Clone **recursively** this repository and just enter `make` in the command line. It should build everything and generate a `SdOut` folder whose contents sould directly be copied to the root of a console SD card.

In order to only build a certain subproject, you can run `make` plus the subproject's name: `make usystem`, `make uloader`, `make umenu`, `make umanager`
In order to only build a certain subproject, you can run `make` plus the subproject's name: `make usystem`, `make uloader`, `make umenu`, `make umanager`, `make uscreen`, `make udesigner`

## Credits

Expand Down
12 changes: 6 additions & 6 deletions docs/udesigner.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if (ENVIRONMENT_IS_NODE) {

// --pre-jses are emitted after the Module integration code, so that they can
// refer to Module (if they choose; they can also define Module)
// include: /tmp/tmptdtwqfll.js
// include: /tmp/tmp42pgm85q.js

if (!Module.expectedDataFileDownloads) {
Module.expectedDataFileDownloads = 0;
Expand Down Expand Up @@ -220,21 +220,21 @@ Module['FS_createPath']("/", "assets", true, true);

})();

// end include: /tmp/tmptdtwqfll.js
// include: /tmp/tmpyzue98uc.js
// end include: /tmp/tmp42pgm85q.js
// include: /tmp/tmp_qkie3hp.js

// All the pre-js content up to here must remain later on, we need to run
// it.
if (Module['$ww'] || (typeof ENVIRONMENT_IS_PTHREAD != 'undefined' && ENVIRONMENT_IS_PTHREAD)) Module['preRun'] = [];
var necessaryPreJSTasks = Module['preRun'].slice();
// end include: /tmp/tmpyzue98uc.js
// include: /tmp/tmp7emfte1w.js
// end include: /tmp/tmp_qkie3hp.js
// include: /tmp/tmp9nqciaoh.js

if (!Module['preRun']) throw 'Module.preRun should exist because file support used it; did a pre-js delete it?';
necessaryPreJSTasks.forEach((task) => {
if (Module['preRun'].indexOf(task) < 0) throw 'All preRun tasks that exist before user pre-js code should remain after; did you replace Module or modify Module.preRun?';
});
// end include: /tmp/tmp7emfte1w.js
// end include: /tmp/tmp9nqciaoh.js


// Sometimes an existing Module object exists with properties
Expand Down

0 comments on commit 729f56a

Please sign in to comment.