jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-30 16:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: resolve include issue with osiris_import.h

Browse Source 
The switcheroo involving OSIRISEXTERN is unnecessary; if it is empty,
it is "extern" anyway.

One function, ``osicommon_Initialize``, is present twice and can lead
to duplicate definitions in the linker stage, which is probably what
the DallasFuncs.cpp comment alluded to. It is moved away into its own
.cpp file.
This commit is contained in:
Jan Engelhardt
2024-09-09 14:20:48 +02:00
parent 006c2fb4ec
commit 90110e43e9
4 changed files with 258 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/DallasFuncs.cpp
View File

@@ -715,10 +715,8 @@
#include "osiris_vector.h"
#include "psrand.h"
// These should really be included, I think, but there's a problem with osiris_import.h being included twice
// #include "osiris_import.h"
// #include "osiris_common.h"
#include "osiris_import.h"
#include "osiris_common.h"
/*