mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
LunaMoo
d60b332536
Merge branch 'master' into TemporaryHackishBranch # Conflicts: # CMakeLists.txt # Common/UI/Context.cpp # Core/Config.cpp # GPU/D3D11/TextureCacheD3D11.cpp # GPU/Directx9/TextureCacheDX9.cpp # GPU/GLES/TextureCacheGLES.cpp # GPU/Vulkan/TextureCacheVulkan.cpp # README.md # UI/GameSettingsScreen.cpp # UI/MainScreen.cpp # UI/NativeApp.cpp # android/assets/ui_atlas.meta # android/assets/ui_atlas.zim # assets/ui_atlas.meta # assets/ui_atlas.zim
3 lines
239 B
Bash
Executable File
3 lines
239 B
Bash
Executable File
./ext/native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas_luna.zim ui_atlas_luna.meta android/assets && cp ui_atlas_luna.zim ui_atlas_luna.meta assets && mv ui_atlas_luna.zim.png ui_preview.png && rm ui_atlas_luna.*
|
|
$SHELL
|