X Tutup
Skip to content
/ scummvm Public

Commit 43bb4ab

Browse files
mikroskmikrosk
committed
BACKENDS: ATARI: Create atarilitedist, atarifulldist and fbdist targets
This should make buildbot integration easier.
1 parent 187ba30 commit 43bb4ab

File tree

11 files changed

+567
-225
lines changed

11 files changed

+567
-225
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ include $(srcdir)/Makefile.common
9797
ENGINE_SUBDIRS_CONFIGURE := $(wildcard $(srcdir)/engines/*/configure.engine)
9898

9999
config.h:
100-
SAVED_ENV_VARS = AR AS ASFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS RANLIB SDL_CONFIG STRIP WINDRES WINDRESFLAGS
100+
SAVED_ENV_VARS = AR AS ASFLAGS CPPFILT CPPFLAGS CXX CXXFLAGS LD LDFLAGS NM RANLIB SDL_CONFIG STRIP WINDRES WINDRESFLAGS
101101

102102
# The environment variable PKG_CONFIG_LIBDIR has a different meaning
103103
# for pkg-config when it is empty and when it is not defined.

‎backends/platform/atari/atari.mk‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
.PHONY: atarilitedist atarifulldist fbdist
2+
3+
DIST_FILES_PLATFORM := $(srcdir)/backends/platform/atari/readme.txt
4+
ifneq (${BACKEND},sdl)
5+
DIST_FILES_PLATFORM += $(srcdir)/backends/platform/atari/patches
6+
endif
7+
8+
LITE_DIR := scummvm-${VERSION}-atari-lite
9+
LITE_DATA := ${LITE_DIR}/data
10+
LITE_DOCS := ${LITE_DIR}/doc
11+
LITE_THEMES :=
12+
13+
FULL_DIR := scummvm-${VERSION}-atari-full
14+
FULL_DATA := ${FULL_DIR}/data
15+
FULL_DOCS := ${FULL_DIR}/doc
16+
FULL_THEMES := ${FULL_DIR}/themes
17+
18+
FB_DIR := scummvm-${VERSION}-firebee
19+
FB_DATA := ${FB_DIR}
20+
FB_DOCS := ${FB_DIR}/doc
21+
FB_THEMES := ${FB_DIR}
22+
23+
atarilitedist: $(EXECUTABLE)
24+
$(RM_REC) ${LITE_DIR}
25+
$(MKDIR) ${LITE_DIR}
26+
27+
$(CP) -a $(EXECUTABLE) ${LITE_DIR}
28+
$(NM) -C ${LITE_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CPPFILT) | sort -u > ${LITE_DIR}/scummvm.sym
29+
$(STRIP) -s ${LITE_DIR}/$(EXECUTABLE)
30+
31+
$(MKDIR) ${LITE_DOCS}
32+
$(CP) -a $(DIST_FILES_DOCS) ${LITE_DOCS}
33+
34+
$(MKDIR) ${LITE_DATA}
35+
$(CP) -a $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${LITE_DATA}
36+
37+
# remove unused files
38+
$(RM) ${LITE_DATA}/helpdialog.zip ${LITE_DATA}/{achievements,classicmacfonts,encoding,macgui}.dat
39+
40+
# rename remaining files still not fitting into the 8+3 limit (this has to be supported by the backend, too)
41+
mv ${LITE_DATA}/supernova.dat ${LITE_DATA}/supernov.dat
42+
mv ${LITE_DATA}/teenagent.dat ${LITE_DATA}/teenagen.dat
43+
44+
# readme.txt
45+
$(CP) -r $(DIST_FILES_PLATFORM) ${LITE_DIR}
46+
unix2dos ${LITE_DIR}/readme.txt
47+
48+
$(RM) ../${LITE_DIR}.zip
49+
$(ZIP) -r -9 ../${LITE_DIR}.zip ${LITE_DIR}
50+
51+
atarifulldist: $(EXECUTABLE)
52+
$(RM_REC) ${FULL_DIR}
53+
$(MKDIR) ${FULL_DIR}
54+
55+
$(CP) -a $(EXECUTABLE) ${FULL_DIR}
56+
$(NM) -C ${FULL_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CPPFILT) | sort -u > ${FULL_DIR}/scummvm.sym
57+
$(STRIP) -s ${FULL_DIR}/$(EXECUTABLE)
58+
59+
$(MKDIR) ${FULL_DOCS}
60+
$(CP) -a $(DIST_FILES_DOCS) ${FULL_DOCS}
61+
62+
$(MKDIR) ${FULL_DATA}
63+
$(CP) -a $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${FULL_DATA}
64+
65+
# remove unused files
66+
$(RM) ${FULL_DATA}/helpdialog.zip ${FULL_DATA}/{achievements,classicmacfonts,encoding,hadesch_translations,macgui,prince_translation}.dat
67+
68+
# rename remaining files still not fitting into the 8+3 limit (this has to be supported by the backend, too)
69+
mv ${FULL_DATA}/cryomni3d.dat ${FULL_DATA}/cryomni3.dat
70+
mv ${FULL_DATA}/neverhood.dat ${FULL_DATA}/neverhoo.dat
71+
mv ${FULL_DATA}/supernova.dat ${FULL_DATA}/supernov.dat
72+
mv ${FULL_DATA}/teenagent.dat ${FULL_DATA}/teenagen.dat
73+
74+
$(MKDIR) ${FULL_THEMES}
75+
$(CP) -a $(DIST_FILES_THEMES) ${FULL_THEMES}
76+
77+
# remove unused files; absent gui-icons.dat massively speeds up startup time (it is used for the grid mode only)
78+
$(RM) ${FULL_THEMES}/{gui-icons,shaders}.dat
79+
80+
# adjust to compression level zero for faster depacking
81+
cd ${FULL_THEMES} && \
82+
for f in *.zip; \
83+
do \
84+
unzip -q -d tmp "$$f" && $(RM) "$$f" && cd tmp && $(ZIP) -0 "../$$f" * && cd .. && $(RM_REC) tmp; \
85+
done
86+
87+
# readme.txt
88+
$(CP) -r $(DIST_FILES_PLATFORM) ${FULL_DIR}
89+
unix2dos ${FULL_DIR}/readme.txt
90+
91+
$(RM) ../${FULL_DIR}.zip
92+
$(ZIP) -r -9 ../${FULL_DIR}.zip ${FULL_DIR}
93+
94+
fbdist: $(EXECUTABLE)
95+
$(RM_REC) ${FB_DIR}
96+
$(MKDIR) ${FB_DIR}
97+
98+
$(CP) -a $(EXECUTABLE) ${FB_DIR}
99+
$(STRIP) -s ${FB_DIR}/$(EXECUTABLE)
100+
101+
$(MKDIR) ${FB_DOCS}
102+
$(CP) -a $(DIST_FILES_DOCS) ${FB_DOCS}
103+
104+
$(MKDIR) ${FB_DATA}
105+
$(CP) -a $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${FB_DATA}
106+
107+
# remove unused files
108+
$(RM) ${FB_DATA}/helpdialog.zip ${FULL_DATA}/{achievements,classicmacfonts,encoding,hadesch_translations,macgui,prince_translation}.dat
109+
110+
$(MKDIR) ${FB_THEMES}
111+
$(CP) -a $(DIST_FILES_THEMES) ${FB_THEMES}
112+
113+
# remove unused files
114+
$(RM) ${FB_THEMES}/{shaders}.dat
115+
116+
# adjust to compression level zero for faster depacking
117+
cd ${FB_THEMES} && \
118+
for f in *.zip; \
119+
do \
120+
unzip -q -d tmp "$$f" && $(RM) "$$f" && cd tmp && $(ZIP) -0 "../$$f" * && cd .. && $(RM_REC) tmp; \
121+
done
122+
123+
# readme.txt
124+
$(CP) -r $(DIST_FILES_PLATFORM) ${FB_DIR}
125+
unix2dos ${FB_DIR}/readme.txt
126+
127+
$(RM) ../${FB_DIR}.zip
128+
$(ZIP) -r -9 ../${FB_DIR}.zip ${FB_DIR}

‎backends/platform/atari/build-firebee.sh‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/bash -eux
2+
# -e: Exit immediately if a command exits with a non-zero status.
3+
# -u: Treat unset variables as an error when substituting.
4+
# -x: Display expanded script commands
5+
6+
mkdir -p build-firebee
7+
cd build-firebee
8+
9+
PLATFORM=m68k-atari-mintelf
10+
FASTCALL=false
11+
export CXXFLAGS="-mcpu=5475"
12+
export LDFLAGS="-mcpu=5475"
13+
#export CXXFLAGS="-m68020-60"
14+
#export LDFLAGS="-m68020-60"
15+
16+
CPU_DIR=$(${PLATFORM}-gcc ${CXXFLAGS} -print-multi-directory)
17+
18+
export PKG_CONFIG_LIBDIR="$(${PLATFORM}-gcc -print-sysroot)/usr/lib/${CPU_DIR}/pkgconfig"
19+
20+
if $FASTCALL
21+
then
22+
CXXFLAGS="$CXXFLAGS -mfastcall"
23+
LDFLAGS="$LDFLAGS -mfastcall"
24+
fi
25+
26+
if [ -f ../backends/platform/atari/.patched ]
27+
then
28+
echo "FireBee SDL target shouldn't contain any ATARI patches!"
29+
exit 1
30+
fi
31+
32+
33+
if [ ! -f config.log ]
34+
then
35+
../configure \
36+
--backend=sdl \
37+
--host=${PLATFORM} \
38+
--with-sdl-prefix="$(${PLATFORM}-gcc -print-sysroot)/usr/bin/${CPU_DIR}" \
39+
--with-freetype2-prefix="$(${PLATFORM}-gcc -print-sysroot)/usr/bin/${CPU_DIR}" \
40+
--with-mikmod-prefix="$(${PLATFORM}-gcc -print-sysroot)/usr/bin/${CPU_DIR}" \
41+
--enable-release \
42+
--enable-verbose-build
43+
fi
44+
45+
make -j$(getconf _NPROCESSORS_CONF) fbdist

‎backends/platform/atari/build-release.sh‎

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ cd build-release
88

99
PLATFORM=m68k-atari-mintelf
1010
FASTCALL=false
11-
1211
export ASFLAGS="-m68020-60"
1312
export CXXFLAGS="-m68020-60 -DUSE_MOVE16 -DUSE_SUPERVIDEL -DUSE_SV_BLITTER -DDISABLE_LAUNCHERDISPLAY_GRID"
14-
1513
export LDFLAGS="-m68020-60"
14+
1615
export PKG_CONFIG_LIBDIR="$(${PLATFORM}-gcc -print-sysroot)/usr/lib/m68020-60/pkgconfig"
1716

1817
if $FASTCALL
@@ -22,6 +21,13 @@ then
2221
LDFLAGS="$LDFLAGS -mfastcall"
2322
fi
2423

24+
if [ ! -f ../backends/platform/atari/.patched ]
25+
then
26+
cd .. && cat backends/platform/atari/patches/print_rate.patch | patch -p1 && cd -
27+
cd .. && cat backends/platform/atari/patches/tooltips.patch | patch -p1 && cd -
28+
touch ../backends/platform/atari/.patched
29+
fi
30+
2531
if [ ! -f config.log ]
2632
then
2733
../configure \
@@ -32,43 +38,4 @@ then
3238
--disable-engine=hugo,director,cine,ultima
3339
fi
3440

35-
make -j$(getconf _NPROCESSORS_CONF)
36-
rm -rf dist-generic
37-
make dist-generic
38-
39-
# create symbol file and strip
40-
rm dist-generic/scummvm/scummvm.prg
41-
cp -a scummvm.prg dist-generic/scummvm/scummvm.prg
42-
${PLATFORM}-nm -C dist-generic/scummvm/scummvm.prg | grep -vF ' .L' | grep ' [TtWV] ' | ${PLATFORM}-c++filt | sort -u > dist-generic/scummvm/scummvm.sym
43-
${PLATFORM}-strip -s dist-generic/scummvm/scummvm.prg
44-
45-
# remove unused files; absent gui-icons.dat massively speeds up startup time (used for the grid mode)
46-
rm dist-generic/scummvm/data/{achievements,classicmacfonts,encoding,gui-icons,hadesch_translations,macgui,prince_translation,shaders}.dat
47-
48-
# rename remaining files still not fitting into the 8+3 limit (this has to be supported by the backend, too)
49-
mv dist-generic/scummvm/data/cryomni3d.dat dist-generic/scummvm/data/cryomni3.dat
50-
mv dist-generic/scummvm/data/neverhood.dat dist-generic/scummvm/data/neverhoo.dat
51-
mv dist-generic/scummvm/data/supernova.dat dist-generic/scummvm/data/supernov.dat
52-
mv dist-generic/scummvm/data/teenagent.dat dist-generic/scummvm/data/teenagen.dat
53-
54-
# move themes into 'themes' folder (with compression level zero for faster depacking)
55-
mkdir -p dist-generic/scummvm/themes
56-
cd dist-generic/scummvm/themes
57-
(
58-
for f in ../data/*.zip
59-
do
60-
unzip -d tmp "$f" && cd tmp && zip -0 ../$(basename "$f") * && cd .. && rm -r tmp && rm "$f"
61-
done
62-
)
63-
cd -
64-
65-
# readme.txt
66-
cp ../backends/platform/atari/readme.txt dist-generic/scummvm
67-
unix2dos dist-generic/scummvm/readme.txt
68-
69-
cd dist-generic
70-
mv scummvm scummvm-3.1.0git-atari-full
71-
zip -r -9 scummvm-3.1.0git-atari-full.zip scummvm-3.1.0git-atari-full
72-
cd -
73-
74-
mv dist-generic/scummvm-3.1.0git-atari-full.zip ..
41+
make -j$(getconf _NPROCESSORS_CONF) atarifulldist

‎backends/platform/atari/build-release.sh.in‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎backends/platform/atari/build-release030.sh‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ cd build-release030
88

99
PLATFORM=m68k-atari-mintelf
1010
FASTCALL=false
11-
1211
export ASFLAGS="-m68030"
1312
export CXXFLAGS="-m68030 -DDISABLE_FANCY_THEMES"
1413
export LDFLAGS="-m68030"
14+
1515
export PKG_CONFIG_LIBDIR="$(${PLATFORM}-gcc -print-sysroot)/usr/lib/m68020-60/pkgconfig"
1616

1717
if $FASTCALL
@@ -21,6 +21,13 @@ then
2121
LDFLAGS="$LDFLAGS -mfastcall"
2222
fi
2323

24+
if [ ! -f ../backends/platform/atari/.patched ]
25+
then
26+
cd .. && cat backends/platform/atari/patches/print_rate.patch | patch -p1 && cd -
27+
cd .. && cat backends/platform/atari/patches/tooltips.patch | patch -p1 && cd -
28+
touch ../backends/platform/atari/.patched
29+
fi
30+
2431
if [ ! -f config.log ]
2532
then
2633
../configure \
@@ -33,30 +40,4 @@ then
3340
--disable-engine=hugo,director,cine,ultima
3441
fi
3542

36-
make -j$(getconf _NPROCESSORS_CONF)
37-
rm -rf dist-generic
38-
make dist-generic
39-
40-
# create symbol file and strip
41-
rm dist-generic/scummvm/scummvm.prg
42-
cp -a scummvm.prg dist-generic/scummvm/scummvm.prg
43-
${PLATFORM}-nm -C dist-generic/scummvm/scummvm.prg | grep -vF ' .L' | grep ' [TtWV] ' | ${PLATFORM}-c++filt | sort -u > dist-generic/scummvm/scummvm.sym
44-
${PLATFORM}-strip -s dist-generic/scummvm/scummvm.prg
45-
46-
# remove unused files
47-
rm dist-generic/scummvm/data/*.zip dist-generic/scummvm/data/{achievements,classicmacfonts,encoding,gui-icons,macgui,shaders}.dat
48-
49-
# rename remaining files still not fitting into the 8+3 limit (this has to be supported by the backend, too)
50-
mv dist-generic/scummvm/data/supernova.dat dist-generic/scummvm/data/supernov.dat
51-
mv dist-generic/scummvm/data/teenagent.dat dist-generic/scummvm/data/teenagen.dat
52-
53-
# readme.txt
54-
cp ../backends/platform/atari/readme.txt dist-generic/scummvm
55-
unix2dos dist-generic/scummvm/readme.txt
56-
57-
cd dist-generic
58-
mv scummvm scummvm-3.1.0git-atari-lite
59-
zip -r -9 scummvm-3.1.0git-atari-lite.zip scummvm-3.1.0git-atari-lite
60-
cd -
61-
62-
mv dist-generic/scummvm-3.1.0git-atari-lite.zip ..
43+
make -j$(getconf _NPROCESSORS_CONF) atarilitedist

0 commit comments

Comments
 (0)
X Tutup