update memalloc

cleolibrary · Oct 13, 2024 · f666f48 · f666f48
1 parent baef953
commit f666f48
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/includes/pcsx2/memalloc.c b/includes/pcsx2/memalloc.c
@@ -28,7 +28,7 @@ typedef struct {
 #define MEM_CUSTOM_TOTAL_SIZE 100000
 #endif
 
-static pmpa_memory_block master_memory_block[MEM_CUSTOM_TOTAL_SIZE] = { 1 };
+static pmpa_memory_block master_memory_block[MEM_CUSTOM_TOTAL_SIZE] = { { MEM_CUSTOM_TOTAL_SIZE - PMPA_MEMORY_BLOCK_HEADER_SIZE, false, 0 } };
 static pmpa_memory_int   master_memory_block_size = MEM_CUSTOM_TOTAL_SIZE;
 
 /*

diff --git a/makefile.lua b/makefile.lua
@@ -18,7 +18,7 @@ ASFLAGS = $(CFLAGS)
 BASE_ADDRESS = %s
 EE_LINKFILE = linkfile
 EE_LIBS += %s
-EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,--no-relax -Wl,-Map,../data/%s.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
+EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,-Map,../data/%s.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
 
 all: clean main-build
 

diff --git a/premake5.lua b/premake5.lua
@@ -79,7 +79,7 @@ workspace "GTALCS.GTAVCS.PCSX2F.CLEO"
             debugdir (gamepath .. (dir or ""))
          end
       end
-      targetdir ("data/%{prj.name}/" .. scriptspath)
+      targetdir ("data/" .. scriptspath)
    end
 
    function add_ps2sdk()

diff --git a/source/makefile b/source/makefile
@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
 BASE_ADDRESS = 0x05000000
 EE_LINKFILE = linkfile
 EE_LIBS += -l:libstdc++.a -l:libm.a
-EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,--no-relax -Wl,-Map,../data/PLUGINS/cleo.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
+EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,-Map,../data/PLUGINS/cleo.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
 
 all: clean main-build