Skip to content

Commit

Permalink
Fix Makefile, remove leftover uDesigner logs
Browse files Browse the repository at this point in the history
  • Loading branch information
XorTroll committed Jul 4, 2024
1 parent c71f085 commit 16a5f91
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 62 deletions.
52 changes: 2 additions & 50 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ all: arc usystem uloader umenu umanager uscreen udesigner

fresh: clean all

pu:
@$(MAKE) -C libs/Plutonium/

arc:
@python arc/arc.py gen_db default+./libs/uCommon/include/ul/ul_Results.rc.hpp
@python arc/arc.py gen_cpp rc UL ./libs/uCommon/include/ul/ul_Results.gen.hpp

clean:
@$(MAKE) clean -C projects/uSystem
@$(MAKE) clean -C projects/uLoader
Expand All @@ -27,51 +20,13 @@ clean:
@cd projects/uScreen && mvn clean
@rm -rf SdOut

usystem: arc
@$(MAKE) -C projects/uSystem
@mkdir -p SdOut/atmosphere/contents/0100000000001000
@cp projects/uSystem/out/nintendo_nx_arm64_armv8a/release/uSystem.nsp SdOut/atmosphere/contents/0100000000001000/exefs.nsp
@mkdir -p SdOut/ulaunch/bin/uSystem
@cp projects/uSystem/out/nintendo_nx_arm64_armv8a/release/uSystem.nsp SdOut/ulaunch/bin/uSystem/exefs.nsp

uloader: arc
@$(MAKE) -C projects/uLoader
@mkdir -p SdOut/ulaunch/bin/uLoader
@mkdir -p SdOut/ulaunch/bin/uLoader/applet
@cp projects/uLoader/uLoader.nso SdOut/ulaunch/bin/uLoader/applet/main
@cp projects/uLoader/uLoader_applet.npdm SdOut/ulaunch/bin/uLoader/applet/main.npdm
@mkdir -p SdOut/ulaunch/bin/uLoader/application
@cp projects/uLoader/uLoader.nso SdOut/ulaunch/bin/uLoader/application/main
@cp projects/uLoader/uLoader_application.npdm SdOut/ulaunch/bin/uLoader/application/main.npdm

umenu: arc pu
@$(MAKE) -C projects/uMenu
@mkdir -p SdOut/ulaunch/bin/uMenu
@mkdir -p SdOut/ulaunch/lang/uMenu
@mkdir -p SdOut/ulaunch/themes
@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
@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

umanager: arc pu
pu:
@$(MAKE) -C libs/Plutonium/

arc:
@python arc/arc.py gen_db default+./libs/uCommon/include/ul/ul_Results.rc.hpp
@python arc/arc.py gen_cpp rc UL ./libs/uCommon/include/ul/ul_Results.gen.hpp

clean:
@$(MAKE) clean -C projects/uSystem
@$(MAKE) clean -C projects/uLoader
@$(MAKE) clean -C projects/uMenu
@$(MAKE) clean -C projects/uManager
@$(MAKE) clean -C projects/uDesigner
@cd projects/uScreen && mvn clean
@rm -rf SdOut

usystem: arc
@$(MAKE) -C projects/uSystem
@mkdir -p SdOut/atmosphere/contents/0100000000001000
Expand Down Expand Up @@ -102,10 +57,7 @@ umenu: arc pu
@build_romfs projects/uMenu/romfs SdOut/ulaunch/bin/uMenu/romfs.bin

umanager: arc pu
@$(MAKE) -C projects/uManager
@mkdir -p SdOut/ulaunch/lang/uManager
@mkdir -p SdOut/switch
@cp projects/uManager/uManager.nro SdOut/switch/uManager.nro
@$(MAKE) -C libs/Plutonium/

uscreen:
@cd projects/uScreen && mvn package
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

### Want to find **themes** for uLaunch? Check the [r/uLaunchThemes subreddit](https://www.reddit.com/r/uLaunchThemes/) or the [Discord server](https://discord.gg/3KpFyaH)!

### Want to make your own uLaunch **themes**? Check the [wiki](https://github.com/XorTroll/uLaunch/wiki)!
### Want to make your own uLaunch **themes**? Check our [web theme editor](https://xortroll.github.io/uLaunch/) or the [wiki](https://github.com/XorTroll/uLaunch/wiki)!

- [Features](#features)
- [Custom features](#custom-features)
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/tmp8xgpoomw.js
// include: /tmp/tmpcdp3wo0a.js

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

})();

// end include: /tmp/tmp8xgpoomw.js
// include: /tmp/tmp0vd8k_ej.js
// end include: /tmp/tmpcdp3wo0a.js
// include: /tmp/tmpuzehj2xx.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/tmp0vd8k_ej.js
// include: /tmp/tmp4y3g3y1a.js
// end include: /tmp/tmpuzehj2xx.js
// include: /tmp/tmpdd5eooui.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/tmp4y3g3y1a.js
// end include: /tmp/tmpdd5eooui.js


// Sometimes an existing Module object exists with properties
Expand Down
Binary file modified docs/udesigner.wasm
Binary file not shown.
8 changes: 3 additions & 5 deletions projects/uDesigner/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ namespace {
strm << std::setw(2) << std::setfill('0') << std::hex << (u32)(color.Value.z * 255.0f);
strm << std::setw(2) << std::setfill('0') << std::hex << (u32)(color.Value.w * 255.0f);

emscripten_log(EM_LOG_CONSOLE, "Generated color '%s'", strm.str().c_str());

return strm.str();
}

Expand Down Expand Up @@ -149,7 +147,7 @@ bool LoadThemeJsonAsset(const char *path, nlohmann::json &out_json) {
emscripten_log(EM_LOG_CONSOLE, "Unable to open theme ZIP JSON asset at '%s'...: %d", path, zip_rc);
return false;
}
emscripten_log(EM_LOG_CONSOLE, "gluglu");

void *json_data;
size_t json_data_size;
zip_rc = zip_entry_read(g_ThemeZip, &json_data, &json_data_size);
Expand All @@ -158,7 +156,7 @@ bool LoadThemeJsonAsset(const char *path, nlohmann::json &out_json) {
emscripten_log(EM_LOG_CONSOLE, "Unable to read theme ZIP JSON asset at '%s'...: %d", path, zip_rc);
return false;
}
emscripten_log(EM_LOG_CONSOLE, "json data %p size %ld", json_data, json_data_size);

std::string json_str(reinterpret_cast<const char*>(json_data), json_data_size);
free(json_data);
zip_entry_close(g_ThemeZip);
Expand Down Expand Up @@ -1910,7 +1908,7 @@ namespace {

LoadEditableElement(&elem_background);

ImGui::InputInt("Suspended application final alpha", &g_suspended_app_final_alpha);
ImGui::DragInt("Suspended application final alpha", &g_suspended_app_final_alpha, 1.0f, 0, 255);

LoadColorPicker("Text color", &g_text_color);
LoadColorPicker("Menu focus color", &g_menu_focus_color);
Expand Down

0 comments on commit 16a5f91

Please sign in to comment.