Skip to content

Commit 0f6852e

Browse files
committed
Update SDL release(Using my prboom-plus port as parameter).
Merge all downloaded libraries to build-external-libs.sh Add genromfs to the external_deps.sh and Update romfs with GCC14 Add fluidsynth-sans-glib from original repository. Adding genromfs from amusat repository.
1 parent a558549 commit 0f6852e

File tree

204 files changed

+296
-126364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+296
-126364
lines changed

Makefile

Lines changed: 22 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
LIBS := \
2-
aalib\
3-
cmakelibs\
42
libconfuse\
5-
libid3tag\
3+
libtimidity\
4+
external_libs\
65
libjpeg_ps2_addons\
7-
libmad\
8-
libtap\
9-
libtiff\
10-
lua\
116
madplay\
12-
ps2stuff\
13-
ps2gl\
14-
ps2_drivers\
157
romfs\
168
sdl\
179
sdlgfx\
18-
sdlimag\
10+
sdlimage\
1911
sdlmixer\
2012
sdlttf\
21-
SIOCookie\
22-
unzip\
2313

2414
LIBS_SAMPLES := \
2515
aalib\
@@ -28,9 +18,6 @@ LIBS_SAMPLES := \
2818
# TODO: Broken samples
2919
# problem seems to be with the C strict mode
3020
# throwing warnings as errors
31-
# sdl
32-
# sdlgfx
33-
# sdlmixer
3421
# ode
3522
# romfs
3623

@@ -48,14 +35,16 @@ clean: $(addprefix clean-, $(LIBS))
4835

4936
samples: $(addprefix sample-, $(LIBS_SAMPLES))
5037

51-
aalib:
52-
$(MAKE) -C $@
53-
$(MAKE) -C $@ install
38+
sample-aalib:
39+
$(MAKE) -C build/aalib sample
5440

55-
cmakelibs: ps2_drivers libtiff
56-
./build-cmakelibs.sh
41+
sample-lua:
42+
$(MAKE) -C build/lua sample platform=PS2
5743

58-
clean-cmakelibs:
44+
external_libs:
45+
./build-external-libs.sh
46+
47+
clean-external_libs:
5948
rm -rf ./build
6049

6150
libconfuse:
@@ -65,39 +54,19 @@ libconfuse:
6554
$(MAKE) -C build/$@ all
6655
$(MAKE) -C build/$@ install
6756

68-
libid3tag: cmakelibs
69-
$(MAKE) -C $@ all
70-
$(MAKE) -C $@ install
71-
72-
libjpeg_ps2_addons: cmakelibs
73-
$(MAKE) -C $@ all
74-
$(MAKE) -C $@ install
57+
libtimidity:
58+
./fetch.sh libtimidity-0.2.7 https://github.com/sezero/libtimidity.git
59+
cd build/$@ && autoreconf -vfi
60+
cd build/$@ && CFLAGS_FOR_TARGET="-G0 -O2 -gdwarf-2 -gz" ./configure --host=mips64r5900el-ps2-elf --prefix=${PS2SDK}/ports --disable-shared --enable-static --disable-aotest --disable-ao
61+
$(MAKE) -C build/$@ all
62+
$(MAKE) -C build/$@ install
7563

76-
libmad: cmakelibs
64+
libjpeg_ps2_addons: external_libs
7765
$(MAKE) -C $@ all
7866
$(MAKE) -C $@ install
7967

80-
libtap:
81-
./fetch.sh master https://github.com/ps2dev/libtap
82-
$(MAKE) -C build/$@ -f Makefile.PS2 all
83-
$(MAKE) -C build/$@ -f Makefile.PS2 install
84-
85-
clean-libtap:
86-
$(MAKE) -C libtap -f Makefile.PS2 clean
87-
88-
lua:
89-
./fetch.sh ee-v5.4.6 https://github.com/ps2dev/lua
90-
$(MAKE) -C build/$@ all platform=PS2
91-
$(MAKE) -C build/$@ install platform=PS2
92-
93-
clean-lua:
94-
$(MAKE) -C lua clean platform=PS2
95-
96-
sample-lua:
97-
$(MAKE) -C lua sample platform=PS2
98-
9968
# depends on SjPCM sound library
100-
madplay: cmakelibs libid3tag libmad
69+
madplay: external_libs
10170
$(MAKE) -C $@ all
10271
$(MAKE) -C $@ install
10372

@@ -107,53 +76,26 @@ ode:
10776
$(MAKE) -C $@
10877
$(MAKE) -C $@ install
10978

110-
ps2_drivers:
111-
./fetch.sh 1.6.2 https://github.com/fjtrujy/ps2_drivers
112-
$(MAKE) -C build/$@ all
113-
$(MAKE) -C build/$@ install
114-
115-
ps2stuff:
116-
./fetch.sh master https://github.com/ps2dev/ps2stuff
117-
$(MAKE) -C build/$@ install
118-
119-
ps2gl: ps2stuff
120-
./fetch.sh master https://github.com/ps2dev/ps2gl
121-
$(MAKE) -C build/$@ install
122-
$(MAKE) -C build/$@/glut install
123-
124-
clean-ps2gl:
125-
$(MAKE) -C build/ps2gl clean
126-
$(MAKE) -C build/ps2gl/glut clean
127-
12879
romfs:
12980
$(MAKE) -C $@
13081
$(MAKE) -C $@ install
13182

132-
sdl: cmakelibs
83+
sdl: external_libs
13384
$(MAKE) -C $@
13485
$(MAKE) -C $@ install
13586

13687
sdlgfx: sdlimage
13788
$(MAKE) -C $@
13889
$(MAKE) -C $@ install
13990

140-
sdlimage: cmakelibs libtiff sdl
91+
sdlimage: external_libs sdl
14192
$(MAKE) -C $@
14293
$(MAKE) -C $@ install
14394

14495
sdlmixer: sdl
14596
$(MAKE) -C $@
14697
$(MAKE) -C $@ install
14798

148-
sdlttf: sdl cmakelibs
149-
$(MAKE) -C $@
150-
$(MAKE) -C $@ install
151-
152-
SIOCookie:
153-
./fetch.sh v1.0.4 https://github.com/israpps/SIOCookie
154-
$(MAKE) -C build/$@ all
155-
$(MAKE) -C build/$@ install
156-
157-
unzip: cmakelibs
99+
sdlttf: sdl external_libs
158100
$(MAKE) -C $@
159101
$(MAKE) -C $@ install

aalib/AUTHORS

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
22

3-
Jan Hubicka ([email protected].cz)
3+
Jan Hubicka (hubicka@freesoft.cz)
44
Thomas A. K. Kjaer ([email protected])
55
Tim Newsome ([email protected])
6-
Kamil Toman (toman@horac.ta.jcu.cz)
6+
Kamil Toman (toman@artax.karlin.mff.cuni.cz)

0 commit comments

Comments
 (0)