Skip to content

Commit b9ba2e5

Browse files
committed
Only build memory_stats for the Dreamcast
1 parent 09a6e2c commit b9ba2e5

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.github/workflows/dreamcast.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,16 @@ jobs:
8484
run: |
8585
source /opt/toolchains/dc/kos/environ.sh && cd build && kos-make
8686
87+
# diabdat.mpq isn't available so this doesn't do anything, but I'll leave it here for documentation purposes
8788
- name: Patch RAM-heavy assets
89+
if: ${{ hashFiles('DIABDAT.MPQ') != '' }}
8890
run: |
89-
[ -e build/data/diabdat ] && \
90-
cp build/data/diabdat/monsters/snake/snakbl.trn build/data/diabdat/monsters/snake/snakb.trn && \
91-
cp blackd.clx build/data/diabdat/monsters/black/blackd.clx && \
92-
cp diablod.clx build/data/diabdat/monsters/diablo/diablod.clx && \
93-
cp diablon.clx build/data/diabdat/monsters/diablo/diablon.clx && \
94-
patch build/data/txt/monsters/monstdat.tsv -l -p0 < monstdat.patch
91+
unpack_and_minify_mpq DIABDAT.MPQ && \
92+
cp diabdat/monsters/snake/snakbl.trn diabdat/monsters/snake/snakb.trn && \
93+
cp blackd.clx diabdat/monsters/black/blackd.clx && \
94+
cp diablod.clx diabdat/monsters/diablo/diablod.clx && \
95+
cp diablon.clx diabdat/monsters/diablo/diablon.clx && \
96+
patch build/data/txtdata/monsters/monstdat.tsv -l -p0 < monstdat.patch
9597
9698
- name: Generate .cdi
9799
run: |

Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ RUN echo "Compiling..."
5252
RUN source /opt/toolchains/dc/kos/environ.sh && cd build && kos-make
5353

5454
RUN echo "Patching RAM-heavy assets..."
55-
RUN [ -e build/data/diabdat ] && \
56-
cp build/data/diabdat/monsters/snake/snakbl.trn build/data/diabdat/monsters/snake/snakb.trn && \
57-
cp blackd.clx build/data/diabdat/monsters/black/blackd.clx && \
58-
cp diablod.clx build/data/diabdat/monsters/diablo/diablod.clx && \
59-
cp diablon.clx build/data/diabdat/monsters/diablo/diablon.clx && \
60-
patch build/data/txt/monsters/monstdat.tsv -l -p0 < monstdat.patch
55+
RUN [ -e diabdat ] && \
56+
cp diabdat/monsters/snake/snakbl.trn diabdat/monsters/snake/snakb.trn && \
57+
cp blackd.clx diabdat/monsters/black/blackd.clx && \
58+
cp diablod.clx diabdat/monsters/diablo/diablod.clx && \
59+
cp diablon.clx diabdat/monsters/diablo/diablon.clx && \
60+
patch build/data/txtdata/monsters/monstdat.tsv -l -p0 < monstdat.patch
6161

6262
RUN echo "Generating CDI"
6363
RUN source /opt/toolchains/dc/kos/environ.sh && \

Source/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include(functions/devilutionx_library)
33
include(functions/genex)
44

55
set(libdevilutionx_SRCS
6-
memory_stats.cpp
76
appfat.cpp
87
automap.cpp
98
capture.cpp
@@ -282,6 +281,9 @@ if(DEVILUTIONX_SCREENSHOT_FORMAT STREQUAL DEVILUTIONX_SCREENSHOT_FORMAT_PNG)
282281
utils/surface_to_png.cpp
283282
)
284283
endif()
284+
if(PLATFORM_DREAMCAST)
285+
list(APPEND libdevilutionx_SRCS memory_stats.cpp)
286+
endif()
285287

286288
add_devilutionx_library(libdevilutionx OBJECT ${libdevilutionx_SRCS})
287289
target_include_directories(libdevilutionx PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

0 commit comments

Comments
 (0)