Merge pull request #31 from MegaMech/linux-build-fixes

Linux build fixes
This commit is contained in:
MegaMech
2025-03-30 14:03:21 -06:00
committed by GitHub
5 changed files with 8 additions and 5 deletions
+1
View File
@@ -19,6 +19,7 @@
#include "math_util.h"
#include <string.h>
#include "src/port/Game.h"
#include "engine/Matrix.h"
s32 fireworkConeColour[] = {
+1 -1
View File
@@ -31,7 +31,7 @@
#include "objects/Seagull.h"
#include "objects/Thwomp.h"
#include "objects/Seagull.h"
#include "objects/Trashbin.h"
#include "objects/TrashBin.h"
#include "objects/Trophy.h"
#include "objects/Snowman.h"
#include "objects/Podium.h"
+1 -1
View File
@@ -8,7 +8,7 @@
#include <fstream>
#include <nlohmann/json.hpp>
#include "port/Engine.h"
#include <libultraship/src/resource/type/json.h>
#include <libultraship/src/resource/type/Json.h>
#include <libultraship/src/resource/File.h>
namespace Editor {
+2
View File
@@ -75,6 +75,8 @@ void CM_TickObjects60fps();
void CM_DrawObjects(s32 cameraId);
void CM_TickEditor();
void CM_DrawEditor();
void CM_Editor_SetLevelDimensions(s16 minX, s16 maxX, s16 minZ, s16 maxZ, s16 minY, s16 maxY);
void CM_TickDraw();
void Editor_ClearMatrix();
+3 -3
View File
@@ -20,15 +20,15 @@ s32 buf = -1;
void FB_CreateFramebuffers(void) {
if (gReusableFrameBuffer == -1) {
gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, true, true, true);
gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, true);
}
if (gN64ResFrameBuffer == -1) {
gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false, true, true);
gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false);
}
if (buf == -1) {
gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false, true, true);
gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false);
}
}