Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Maintenance] grzview: Copy-paste .GRZ stream arrays 

Unfortunate, but we won't be able to reuse the same .OBJ file once we
compile all pipeline tools with the `pascal` calling convention.
Separately compiling `th01/formats/img_data.cpp` would also turn into a
mess with the upcoming `#include` cleanup:

• `img_data.cpp` requires `ptn.hpp`,
• which will require `egc.h`,
• which requires `defconv.h`,
• which requires `GAME` to be defined,
• which makes no sense for pipeline tools.

Part of P0002, funded by GhostPhanom.
This commit is contained in:
nmlgc 2024-05-30 11:40:31 +02:00
parent 0310154789
commit a214f329a7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.mak
View File

@ -56,7 +56,7 @@ th05:: $(TH05:\=bin\th05\)
.obj.com:
tlink /t /3 $**
bin\Pipeline\grzview.com: Pipeline\grzview.cpp th01\formats\grz.cpp bin\th01\f_imgd.obj platform\x86real\pc98\palette.cpp
bin\Pipeline\grzview.com: Pipeline\grzview.cpp th01\formats\grz.cpp platform\x86real\pc98\palette.cpp
$(CC) $(CFLAGS) -Z -DGAME=1 -mt -lt -nbin\Pipeline\ @&&|
$**
| masters.lib

6
Pipeline/grzview.cpp
View File

@ -8,6 +8,12 @@
#include "platform/x86real/pc98/palette.hpp"
#include "th01/formats/grz.h"
// Copied from th01/formats/img_data.cpp. Unfortunate, but better than linking
// in or separately compiling this translation unit.
uint8_t* rle_streams[GRX_COUNT];
dots8_t* planar_streams[GRX_COUNT][PLANAR_STREAM_PER_GRX_COUNT];
uint8_t planar_stream_count[GRX_COUNT];
void grcg_setcolor_rmw(vc2 col)
{
grcg_setcolor(GC_RMW, col);