mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-20 13:24:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Windows build fixes

Browse Source 
Name mangling/linkage shenanigans

Remove jsystem_stubs.cpp, it's not necessary.
This commit is contained in:
PJB3005
2026-02-25 20:43:43 +01:00
parent 8202bab196
commit e7e176bfd4
13 changed files with 26 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JAudio2/JASHeapCtrl.cpp
-2
View File
@@ -8,7 +8,6 @@
#include "JSystem/JUtility/JUTAssert.h"
#include <dolphin/ar.h>
#if !TARGET_PC
JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) {
mDisposer = disposer;
mBase = NULL;
@@ -16,7 +15,6 @@ JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) {
field_0x40 = 0;
OSInitMutex(&mMutex);
}
#endif
void JASHeap::initRootHeap(void* param_0, u32 param_1) {
JUT_ASSERT(97, ! isAllocated());
src/JSystem/JKernel/JKRHeap.cpp
+10 -10
View File
@@ -498,7 +498,7 @@ bool JKRHeap::isSubHeap(JKRHeap* heap) const {
return false;
}
#ifdef __MWERKS__
#if !TARGET_PC
void* operator new(size_t size) {
return JKRHeap::alloc(size, 4, NULL);
}
@@ -516,14 +516,14 @@ void* operator new(size_t size) {
}
#endif
#ifdef __MWERKS__
#if !TARGET_PC
void* operator new(size_t size, int alignment) {
return JKRHeap::alloc(size, alignment, NULL);
}
#else
void* operator new(size_t size, int alignment) {
if (sCurrentHeap == nullptr)
#if TARGET_PC
#if !_WIN32
return aligned_alloc(alignment, size);
#else
return _aligned_malloc(size, alignment);
@@ -531,7 +531,7 @@ void* operator new(size_t size, int alignment) {
void* mem = JKRHeap::alloc(size, alignment, nullptr);
if (mem == nullptr) {
OSReport("[NEW] JKRHeap FULL! Fallback to aligned_malloc size %u\n", (unsigned)size);
#if TARGET_PC
#if !_WIN32
return aligned_alloc(alignment, size);
#else
return _aligned_malloc(size, alignment);
@@ -545,7 +545,7 @@ void* operator new(size_t size, JKRHeap* heap, int alignment) {
return JKRHeap::alloc(size, alignment, heap);
}
#ifdef __MWERKS__
#if !TARGET_PC
void* operator new[](size_t size) {
return JKRHeap::alloc(size, 4, NULL);
}
@@ -561,21 +561,21 @@ void* operator new[](size_t size) {
}
#endif
#ifdef __MWERKS__
#if !TARGET_PC
void* operator new[](size_t size, int alignment) {
return JKRHeap::alloc(size, alignment, NULL);
}
#else
void* operator new[](size_t size, int alignment) {
if (sCurrentHeap == nullptr)
#if TARGET_PC
#if !_WIN32
return aligned_alloc(alignment, size);
#else
return _aligned_malloc(size, alignment);
#endif
void* mem = JKRHeap::alloc(size, alignment, nullptr);
if (mem == nullptr)
#if TARGET_PC
#if !_WIN32
return aligned_alloc(alignment, size);
#else
return _aligned_malloc(size, alignment);
@@ -588,7 +588,7 @@ void* operator new[](size_t size, JKRHeap* heap, int alignment) {
return JKRHeap::alloc(size, alignment, heap);
}
#ifdef __MWERKS__
#if !TARGET_PC
void operator delete(void* ptr) {
JKRHeap::free(ptr, NULL);
}
@@ -605,7 +605,7 @@ void operator delete(void* ptr) {
}
#endif
#ifdef __MWERKS__
#if !TARGET_PC
void operator delete[](void* ptr) {
JKRHeap::free(ptr, NULL);
}