Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

Develop devcontainer #42

Open
wants to merge 105 commits into
base: gameblabla-fork-updates
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
e036e58
Use libdragon submodule.
networkfusion Jun 10, 2023
0e3af9c
Add libs as submodules.
networkfusion Jun 10, 2023
6803e36
Add submodules
networkfusion Jun 10, 2023
9e250b8
Add CI
networkfusion Jun 10, 2023
39f2556
test lib builds
networkfusion Jun 10, 2023
4a931f9
test post create command
networkfusion Jun 10, 2023
eecf2c4
Update postCreateCommand.sh
networkfusion Jun 10, 2023
e7fa635
test making execute permissions
networkfusion Jun 10, 2023
1552602
Test installing libs
networkfusion Jun 10, 2023
35a62de
Test libyaml changes
networkfusion Jun 10, 2023
d5db812
add the bootstrap
networkfusion Jun 10, 2023
a030ff5
Update ignored (submodule) repos
networkfusion Jun 10, 2023
9784e29
comment out buffer.
networkfusion Jun 10, 2023
5fe3aac
Add libmad
networkfusion Jun 10, 2023
16d144e
dont use cpu for libMad
networkfusion Jun 10, 2023
c51e3e4
libmad test
networkfusion Jun 10, 2023
780d73e
Comment out MP3 playback
networkfusion Jun 10, 2023
62d08c1
Improve make file
networkfusion Jun 10, 2023
de5a1b6
Fix yaml lib?
networkfusion Jun 10, 2023
b403387
Revert last commit
networkfusion Jun 10, 2023
061ee65
Remove SP_PC it is already in libdragon.
networkfusion Jun 10, 2023
a7494a5
Re-add ff.h
networkfusion Jun 10, 2023
c406d39
Fix ff.h in last commit.
networkfusion Jun 10, 2023
54836d2
Part revert makefile
networkfusion Jun 10, 2023
fdcf460
Play with params
networkfusion Jun 10, 2023
48164ef
Another test
networkfusion Jun 11, 2023
7f4c5e0
Revert dma wait
networkfusion Jun 11, 2023
ec0dce4
Comment out yaml for the moment.
networkfusion Jun 11, 2023
94daee1
use libdragon fatfs header?
networkfusion Jun 11, 2023
f41301c
Use libdragon fatfs
networkfusion Jun 11, 2023
b98d093
Switch to libdragon unstable
networkfusion Jun 12, 2023
f9d9882
replace display_lock
networkfusion Jun 12, 2023
5ad51d8
remove mikmod
networkfusion Jun 12, 2023
eb881a3
replace dma_busy
networkfusion Jun 12, 2023
af9c9d4
Update submodule
networkfusion Jun 12, 2023
18509ca
revert display_get
networkfusion Jun 12, 2023
aa40453
Work on container install.
networkfusion Jun 12, 2023
f3161f2
Further work.
networkfusion Jun 12, 2023
b387628
Revert to trunk and add hack.
networkfusion Jun 12, 2023
f31e41f
Fix output dir
networkfusion Jun 12, 2023
9832ed2
Further attempt at libyaml
networkfusion Jun 12, 2023
449dd83
Improve build script for libs
networkfusion Jun 12, 2023
de771ab
make script executable?
networkfusion Jun 12, 2023
9ba8093
Re-add yaml parser
networkfusion Jun 12, 2023
fa5ec32
Re-add libmad to makefile
networkfusion Jun 12, 2023
86edcc5
switch to lf line endings
networkfusion Jun 12, 2023
d6ee385
Update .gitmodules
networkfusion Jun 12, 2023
3de3cde
Update .gitmodules
networkfusion Jun 12, 2023
1486183
Update .gitmodules
networkfusion Jun 12, 2023
6e9a8a1
Update .gitmodules
networkfusion Jun 12, 2023
afde070
Improve readme.
networkfusion Jun 12, 2023
e2349c9
Ensure the correct branch for libmad
networkfusion Jun 12, 2023
16f9cb3
Update Makefile
networkfusion Jun 12, 2023
c50a60a
remove libmad submodule
networkfusion Jun 12, 2023
25f9156
re-init libmad
networkfusion Jun 12, 2023
7bb013c
Correct separator in makefile
networkfusion Jun 12, 2023
e34e132
Test multiple flashcarts
networkfusion Jun 12, 2023
aaf0d7b
Minor improvements.
networkfusion Jun 12, 2023
c05e688
uncomment mp3.c
networkfusion Jun 12, 2023
d60d7ab
Uncomment mp3 changes in main.c
networkfusion Jun 12, 2023
e7d49c7
Uncomment mp3.h
networkfusion Jun 12, 2023
9a1aef0
Update sound.c
networkfusion Jun 12, 2023
2e7774c
Split build into matrix for different flashcarts.
networkfusion Jun 12, 2023
00d8536
Fix yaml
networkfusion Jun 12, 2023
4e3dc36
Minor improvements
networkfusion Jun 12, 2023
ea5e00a
Minor improvements.
networkfusion Jun 12, 2023
7bc8c8d
Fix display output
networkfusion Jun 14, 2023
47568df
Fix SD mounting
networkfusion Jun 14, 2023
558fdd8
Add ED64 firmware
networkfusion Jun 14, 2023
49769ac
Fix draw sprite
networkfusion Jun 14, 2023
ec4df9e
Work on dfs locations
networkfusion Jun 14, 2023
4ee473f
Re-enable sound
networkfusion Jun 14, 2023
217e12f
revert surface_t changes
networkfusion Jun 14, 2023
5044404
Rename mempak to CPak
networkfusion Jun 14, 2023
12fd56c
Fix define for ed64p
networkfusion Jun 14, 2023
560a9bb
Minor makefile improvements
networkfusion Jun 14, 2023
6c69efe
remove STB_TRUETYPE_IMPLEMENTATION
networkfusion Jun 14, 2023
94f2936
Futher work on makefile
networkfusion Jun 14, 2023
e80805e
Further work to align makefile
networkfusion Jun 14, 2023
942f691
fix some warnings.
networkfusion Jun 14, 2023
2745c8c
Add CI rename hack
networkfusion Jun 14, 2023
b666432
Work on types.
networkfusion Jun 15, 2023
0131e49
Update config files
networkfusion Jun 15, 2023
7c6bdb8
Move to altra64 ini
networkfusion Jun 15, 2023
26bce78
Improve about
networkfusion Jun 15, 2023
2750af7
Update sound.c types
networkfusion Jun 16, 2023
bdd93b8
part rename display_context_t
networkfusion Jun 16, 2023
d0c63df
work on types
networkfusion Jun 16, 2023
1db3f19
work on display
networkfusion Jun 16, 2023
86e8a21
Replace sleep with libdragon wait_ms where possible
networkfusion Jun 16, 2023
6572970
Remove MP3 support
networkfusion Jun 16, 2023
2fbc8fe
Improve display lock
networkfusion Jun 17, 2023
3781a61
minor changes
networkfusion Jun 17, 2023
96744a8
display updates
networkfusion Jun 19, 2023
b8255c1
work on types
networkfusion Jun 19, 2023
76aa817
Start sorting dfs
networkfusion Jun 19, 2023
255d6ad
loadpng fix
networkfusion Jun 19, 2023
05e1338
work on types
networkfusion Jun 19, 2023
316cdf2
types improvements
networkfusion Jun 19, 2023
f0a50dc
rename mempak to cpak
networkfusion Jun 19, 2023
f791eb9
if statement fixes
networkfusion Jun 20, 2023
f898464
fix spacing.
networkfusion Jun 20, 2023
3ab354a
Work on warnings
networkfusion Jun 21, 2023
0032450
Remove obsolete fonts
networkfusion Jun 22, 2023
cb0551e
Update stb_image.h
networkfusion Jun 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use libdragon submodule.
Move to dev container.
Start fixing issues.
Remove some WSL specific scripts.
networkfusion committed Jun 10, 2023
commit e036e58e735eb39ba7ef80e4098fb11c2de4dd4f
14 changes: 14 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM ubuntu:latest

RUN apt-get update && \
apt-get upgrade -y && \
apt-get install build-essential git python3 wget -y && \
apt-get install texinfo libc6 libgmp-dev libmpfr-dev libmpc-dev libpng-dev zlib1g-dev libtool autoconf -y && \
wget https://github.com/DragonMinded/libdragon/releases/download/toolchain-continuous-prerelease/gcc-toolchain-mips64-x86_64.deb && \
dpkg -i gcc-toolchain-mips64-x86_64.deb && \
rm gcc-toolchain-mips64-x86_64.deb && \
wget https://github.com/Polprzewodnikowy/SummerCart64/releases/download/v2.15.1/sc64-deployer-linux-v2.15.1.tar.gz && \
tar -xf sc64-deployer-linux-v2.15.1.tar.gz -C /usr/local/bin && \
rm sc64-deployer-linux-v2.15.1.tar.gz && \
SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" && \
echo "$SNIPPET" >> "/root/.bashrc"
23 changes: 23 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "Altra64-menu",
"build": {
"dockerfile": "Dockerfile"
},
"mounts": [
"source=altra64-menu-bashhistory,target=/commandhistory,type=volume"
],
"postCreateCommand": "cd ./libdragon && ./build.sh",
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools",
"ms-vscode.makefile-tools"
],
"settings": {
"git.ignoredRepositories": [
"libdragon"
]
}
}
}
}
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto eol=crlf
# These are all bash scripts and should use lf
*.sh text eol=lf
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libdragon"]
path = libdragon
url = https://github.com/DragonMinded/libdragon.git
23 changes: 0 additions & 23 deletions build.cmd

This file was deleted.

1 change: 1 addition & 0 deletions libdragon
Submodule libdragon added at 6fbe02
6 changes: 3 additions & 3 deletions src/image.c
Original file line number Diff line number Diff line change
@@ -166,17 +166,17 @@ void drawImage(display_context_t dcon, sprite_t *sprite) {
rdp_sync(SYNC_PIPE);
rdp_set_default_clipping();
rdp_enable_texture_copy();
rdp_attach_display(dcon);
rdp_attach(dcon);
// Draw image
for (int j=0; j<sprite->vslices; j++) {
x = 0;
for (int i=0; i<sprite->hslices; i++) {
rdp_sync(SYNC_PIPE);
rdp_load_texture_stride(0, 0, MIRROR_DISABLED, sprite, j*sprite->hslices + i);
rdp_draw_sprite(0, x, y);
rdp_draw_sprite(0, x, y, MIRROR_DISABLED);
x += 32;
}
y += 16;
}
rdp_detach_display();
rdp_detach();
}
4 changes: 2 additions & 2 deletions src/main.c
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
#include "menu.h"
#include "cic.h"

#define ED64PLUS
//#define ED64PLUS - FIXME: move to makefile!!!

#ifdef ED64PLUS
#define ED64_FIRMWARE_PATH "ED64P"
@@ -4614,7 +4614,7 @@ int main(void)
break;
}

init_interrupts();
//init_interrupts();

if (sound_on)
{
2 changes: 1 addition & 1 deletion src/version.c
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

#include "version.h"

#define ALTRA64_VERSION "0.2.0.3 beta"
#define ALTRA64_VERSION "2.0.0.ALPHA"

const char* Altra64_GetVersionString(void)
{
51 changes: 0 additions & 51 deletions tools/reset-wsfl.cmd

This file was deleted.

56 changes: 0 additions & 56 deletions tools/setup-wsfl.cmd

This file was deleted.