Skip to content

bsp-compilation: build on Linux/GCC (missing includes, uint16_t, strdup) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SickoHours wants to merge 4 commits into
base: bsp-compilation
Choose a base branch
from
Open

bsp-compilation: build on Linux/GCC (missing includes, uint16_t, strdup) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3306c65
fix: include <cstdint> in D3D11ShaderAnalyser.h (GCC 16)
SickoHours Sep 21, 2026
5093063
fix: BSP sources build with GCC 16 (stray pragma once, <cstring>, <cm…
SickoHours Sep 21, 2026
772c479
fix: GfxWorldLinker builds with GCC 16 (uint16_t for __int16, <cmath>…
SickoHours Sep 21, 2026
2b3c617
fix: strdup instead of _strdup in LoaderTechniqueSetT6 (POSIX)
SickoHours Sep 21, 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
1 change: 1 addition & 0 deletions src/ObjCommon/Shader/D3D11ShaderAnalyser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <memory>
#include <string>
#include <cstdint>
#include <vector>

namespace d3d11
Expand Down
1 change: 0 additions & 1 deletion src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#pragma once

#include "BSPUtil.h"

Expand Down
1 change: 1 addition & 0 deletions src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cstring>
#include "BSPLinker.h"

#include "ClipMapLinker.h"
Expand Down
1 change: 1 addition & 0 deletions src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cstring>
#include "ClipMapLinker.h"

#include "../BSPUtil.h"
Expand Down
1 change: 1 addition & 0 deletions src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cmath>
#include "ComWorldLinker.h"

#include <numbers>
Expand Down
7 changes: 5 additions & 2 deletions src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#include <cmath>
#include <cstdint>
#include <cstring>
#include "GfxWorldLinker.h"

#include "../BSPCalculation.h"
Expand Down Expand Up @@ -534,8 +537,8 @@ namespace BSP

struct mnode_t
{
unsigned __int16 cellIndex;
unsigned __int16 rightChildOffset;
uint16_t cellIndex;
uint16_t rightChildOffset;
};

void GfxWorldLinker::loadGfxCells(GfxWorld* gfxWorld)
Expand Down
8 changes: 4 additions & 4 deletions src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace
const auto js = nlohmann::json::parse(*file.m_stream.get());

std::string techSetName = js["name"];
techniqueSet->name = _strdup(techSetName.c_str());
techniqueSet->name = strdup(techSetName.c_str());
techniqueSet->worldVertFormat = (unsigned char)js["worldVertFormat"];

for (int i = 0; i < 36; i++)
Expand All @@ -50,7 +50,7 @@ namespace
techniqueSet->techniques[i] = technique;

std::string techName = techniqueJs["name"];
technique->name = _strdup(techName.c_str());
technique->name = strdup(techName.c_str());
technique->flags = techniqueJs["flags"];
technique->passCount = techniqueJs["passCount"];
assert(technique->passCount == 1);
Expand Down Expand Up @@ -127,7 +127,7 @@ namespace
currPass->pixelShader = new MaterialPixelShader;

std::string pixelName = passJs["pixelShader"]["name"];
currPass->pixelShader->name = _strdup(pixelName.c_str());
currPass->pixelShader->name = strdup(pixelName.c_str());
currPass->pixelShader->prog.ps = nullptr;

const auto psFileName = shader::GetFileNameForPixelShaderAssetName(pixelName);
Expand All @@ -151,7 +151,7 @@ namespace
currPass->vertexShader = new MaterialVertexShader;

std::string vertexName = passJs["vertexShader"]["name"];
currPass->vertexShader->name = _strdup(vertexName.c_str());
currPass->vertexShader->name = strdup(vertexName.c_str());
currPass->vertexShader->prog.vs = nullptr;

const auto vsFileName = shader::GetFileNameForVertexShaderAssetName(vertexName);
Expand Down