Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5b5d602
improved makefile comments for fuses
Unreal-Dan Jan 21, 2026
700b103
various backported changes from various devices
Unreal-Dan Feb 19, 2026
099d9a4
fixed default modes
Unreal-Dan Feb 19, 2026
b629a92
pinned emsdk version
Unreal-Dan Feb 19, 2026
022d965
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 19, 2026
0911a38
Merge branch 'daniel/duo-makefile-comment-fix' into daniel/duo/master…
Unreal-Dan Feb 19, 2026
f69aba0
minor fix
Unreal-Dan Feb 19, 2026
3642ddf
pinned wasm version
Unreal-Dan Feb 19, 2026
c423699
minor fixes and updates
Unreal-Dan Feb 19, 2026
ecbc4e4
more fixes
Unreal-Dan Feb 19, 2026
f32f0ff
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 19, 2026
1d21473
small fix
Unreal-Dan Feb 19, 2026
ca5c375
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 19, 2026
bf4152b
small fix
Unreal-Dan Feb 19, 2026
0deeb9a
added memory operators toggle
Unreal-Dan Feb 22, 2026
01f3291
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 22, 2026
d19d08b
small whitespace
Unreal-Dan Feb 22, 2026
906dac2
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 22, 2026
8fc4117
more small fixes
Unreal-Dan Feb 22, 2026
2a91c1f
small fix
Unreal-Dan Feb 22, 2026
0067662
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 22, 2026
ab86050
small fix
Unreal-Dan Feb 22, 2026
3dcfd87
Merge branch 'daniel/core/master-backport-feb-2026' into daniel/duo/m…
Unreal-Dan Feb 22, 2026
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
10 changes: 7 additions & 3 deletions .github/workflows/duo_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
branches: [ "duo" ]
workflow_dispatch: # manual trigger

env:
EMSDK_VERSION: "3.1.74"

jobs:
setup:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -116,11 +119,12 @@ jobs:
run: sudo apt-get update
- name: Install Emscripten
run: |
sudo apt install -y cmake python3
git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
./emsdk install latest
./emsdk activate latest
git fetch --tags
git checkout "${EMSDK_VERSION}"
./emsdk install "${EMSDK_VERSION}"
./emsdk activate "${EMSDK_VERSION}"
working-directory: VortexEngine/VortexLib
- name: Build Webassembly
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ OSCCFG = 0x02
#FUSE3 = 0x00
# TCD0CFG { CMPA=CLEAR, CMPB=CLEAR, CMPC=CLEAR, CMPD=CLEAR, CMPAEN=CLEAR, CPMCEN=CLEAR, CMPDEN=CLEAR }
TCD0CFG = 0x00
# SYSCFG0
# SYSCFG0 { CRCSRC=NOCRC, RESERVED=0, TOUTDIS=0, RSTPINCFG=UPDI, EESAVE=$(SAVE_EEPROM) (usually 1) }
SYSCFG0 = 0b1100010$(SAVE_EEPROM)
# SYSCFG1 { SUT=64ms }
SYSCFG1 = 0x07
Expand Down
2 changes: 1 addition & 1 deletion VortexEngine/src/Memory/Memory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ uint32_t cur_memory_usage_total()

#endif // DEBUG_ALLOCATIONS == 1

#ifndef VORTEX_LIB
#if CPP_MEMORY_OPERATORS == 1

// for C++11 need the following:
void *operator new (size_t size) { return vmalloc(size); }
Expand Down
4 changes: 3 additions & 1 deletion VortexEngine/src/Memory/Memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ uint32_t cur_memory_usage_total();

#endif

#ifndef VORTEX_LIB
#if CPP_MEMORY_OPERATORS == 1

void *operator new (size_t size);
void *operator new[](size_t size);
void operator delete (void *ptr);
Expand All @@ -51,6 +52,7 @@ void operator delete[](void *ptr, size_t size) noexcept;
//void operator delete[](void *ptr, std::align_val_t al) noexcept;
//void operator delete (void *ptr, size_t size, std::align_val_t al) noexcept;
//void operator delete[](void *ptr, size_t size, std::align_val_t al) noexcept;

#endif

#endif
Loading