Skip to content

Commit 638e981

Browse files
brijohnbrijohn
committed
Revert "remove library building from scripts"
This reverts commit 96f7acc.
1 parent 562b25c commit 638e981

File tree

5 files changed

+139
-2
lines changed

5 files changed

+139
-2
lines changed

‎build-devkit.sh‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#---------------------------------------------------------------------------------
3-
# devkitARM release 53-1
3+
# devkitARM release 52-2
44
# devkitPPC release 35
55
# devkitA64 release 14
66
# devkitSH4 release 2
@@ -28,10 +28,17 @@ echo
2828

2929
GENERAL_TOOLS_VER=1.0.2
3030

31+
LIBGBA_VER=0.5.2
3132
GBATOOLS_VER=1.1.0
3233
DKARM_RULES_VER=1.0.0
3334
DKARM_CRTLS_VER=1.0.0
3435

36+
LIBNDS_VER=1.7.2
37+
DEFAULT_ARM7_VER=0.7.4
38+
DSWIFI_VER=0.4.2
39+
MAXMOD_VER=1.0.11
40+
FILESYSTEM_VER=0.9.14
41+
LIBFAT_VER=1.1.3
3542
DSTOOLS_VER=1.2.1
3643
GRIT_VER=0.8.15
3744
NDSTOOL_VER=2.1.1
@@ -41,9 +48,13 @@ DFU_UTIL_VER=0.9.1
4148
STLINK_VER=1.2.3
4249

4350
GAMECUBE_TOOLS_VER=1.0.2
51+
LIBOGC_VER=1.8.21
4452
WIILOAD_VER=0.5.1
4553
DKPPC_RULES_VER=1.0.0
4654

55+
LIBCTRU_VER=1.5.1
56+
CITRO3D_VER=1.5.0
57+
CITRO2D_VER=1.1.0
4758
TOOLS3DS_VER=1.1.4
4859
LINK3DS_VER=0.5.2
4960
PICASSO_VER=2.7.0
@@ -53,6 +64,7 @@ GP32_TOOLS_VER=1.0.3
5364
LIBMIRKO_VER=0.9.8
5465

5566
SWITCH_TOOLS_VER=1.4.1
67+
LIBNX_VER=1.3.0
5668

5769
ELF2D01_VER=master
5870
LIBDATAPLUS_VER=master
@@ -222,6 +234,12 @@ archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_
222234

223235
if [ $VERSION -eq 1 ]; then
224236

237+
targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
238+
libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
239+
default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
240+
libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2 citro3d-src-${CITRO3D_VER}.tar.bz2
241+
citro2d-src-${CITRO2D_VER}.tar.bz2"
242+
225243
hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2
226244
dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
227245
general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
@@ -233,13 +251,17 @@ fi
233251

234252
if [ $VERSION -eq 2 ]; then
235253

254+
targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
255+
236256
hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
237257

238258
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
239259
fi
240260

241261
if [ $VERSION -eq 3 ]; then
242262

263+
targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
264+
243265
hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
244266

245267
fi
@@ -256,7 +278,7 @@ else
256278
fi
257279

258280
cd "$SRCDIR"
259-
for archive in $archives $hostarchives
281+
for archive in $archives $targetarchives $hostarchives
260282
do
261283
echo $archive
262284
if [ ! -f $archive ]; then
@@ -313,6 +335,10 @@ if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; the
313335
. $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
314336
fi
315337

338+
if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then
339+
. $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
340+
fi
341+
316342
cd $BUILDSCRIPTDIR
317343

318344
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then

‎config.sh.sample‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ BUILD_DKPRO_PACKAGE=0
3636
#---------------------------------------------------------------------------------
3737
#BUILD_DKPRO_SKIP_TOOLS=1
3838

39+
#---------------------------------------------------------------------------------
40+
# Uncomment to skip building of libraries
41+
#---------------------------------------------------------------------------------
42+
#BUILD_DKPRO_SKIP_LIBRARIES=1
43+
44+
3945
# Automated script execution
4046
#---------------------------------------------------------------------------------
4147
# 0: Ask to delete build folders & patched sources

‎dka64/scripts/build-libs.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
export DEVKITPRO=$TOOLPATH
4+
5+
cd $BUILDDIR/libnx-$LIBNX_VER
6+
$MAKE || { echo "error building libnx"; exit 1; }
7+
$MAKE install || { echo "error installing libnx"; exit 1; }

‎dkarm-eabi/scripts/build-libs.sh‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#!/bin/sh
2+
3+
#---------------------------------------------------------------------------------
4+
# set env variables
5+
#---------------------------------------------------------------------------------
6+
export DEVKITPRO=$TOOLPATH
7+
export DEVKITARM=$DEVKITPRO/devkitARM
8+
9+
#---------------------------------------------------------------------------------
10+
# Install the rules files
11+
#---------------------------------------------------------------------------------
12+
cd $BUILDDIR
13+
14+
mkdir -p rules
15+
cd rules
16+
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
17+
make install
18+
19+
#---------------------------------------------------------------------------------
20+
# Install and build the crt0 files
21+
#---------------------------------------------------------------------------------
22+
cd $BUILDDIR
23+
24+
mkdir -p crtls
25+
cd crtls
26+
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
27+
make install
28+
29+
cd $BUILDDIR/libgba-$LIBGBA_VER
30+
$MAKE || { echo "error building libgba"; exit 1; }
31+
$MAKE install || { echo "error installing libgba"; exit 1; }
32+
33+
cd $BUILDDIR/libnds-$LIBNDS_VER
34+
$MAKE || { echo "error building libnds"; exit 1; }
35+
$MAKE install || { echo "error installing libnds"; exit 1; }
36+
37+
cd $BUILDDIR/dswifi-$DSWIFI_VER
38+
$MAKE || { echo "error building dswifi"; exit 1; }
39+
$MAKE install || { echo "error installing dswifi"; exit 1; }
40+
41+
cd $BUILDDIR/maxmod-$MAXMOD_VER
42+
$MAKE || { echo "error building maxmod"; exit 1; }
43+
$MAKE install || { echo "error installing maxmod"; exit 1; }
44+
45+
cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
46+
$MAKE || { echo "error building default arm7"; exit 1; }
47+
$MAKE install || { echo "error installing default arm7"; exit 1; }
48+
49+
cd $BUILDDIR/libfat-$LIBFAT_VER
50+
$MAKE nds-install || { echo "error building nds libfat"; exit 1; }
51+
$MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
52+
53+
#cd $BUILDDIR/libmirko-$LIBMIRKO_VER
54+
#$MAKE || { echo "error building libmirko"; exit 1; }
55+
#$MAKE install || { echo "error installing libmirko"; exit 1; }
56+
57+
cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER
58+
$MAKE || { echo "error building libfilesystem"; exit 1; }
59+
$MAKE install || { echo "error installing libfilesystem"; exit 1; }
60+
61+
cd $BUILDDIR/libctru-$LIBCTRU_VER
62+
$MAKE || { echo "error building libctru"; exit 1; }
63+
$MAKE install || { echo "error installing libctru"; exit 1; }
64+
65+
cd $BUILDDIR/citro3d-$CITRO3D_VER
66+
$MAKE || { echo "error building citro3d"; exit 1; }
67+
$MAKE install || { echo "error installing citro3d"; exit 1; }
68+
69+
cd $BUILDDIR/citro2d-$CITRO2D_VER
70+
$MAKE || { echo "error building citro2d"; exit 1; }
71+
$MAKE install || { echo "error installing citro2d"; exit 1; }

‎dkppc/scripts/build-libs.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
3+
export DEVKITPPC=$TOOLPATH/devkitPPC
4+
export DEVKITPRO=$TOOLPATH
5+
6+
cd $BUILDDIR
7+
mkdir -p rules
8+
cd rules
9+
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
10+
make install
11+
12+
cd $BUILDDIR/libogc-$LIBOGC_VER
13+
14+
if [ ! -f installed ]; then
15+
echo "Building & installing libogc"
16+
$MAKE install || { echo "libogc install failed"; exit 1; }
17+
touch installed
18+
fi
19+
20+
cd $BUILDDIR/libfat-$LIBFAT_VER
21+
22+
if [ ! -f installed ]; then
23+
echo "Building & installing libfat"
24+
$MAKE ogc-install || { echo "libfat install failed"; exit 1; }
25+
touch installed
26+
fi
27+

0 commit comments

Comments
 (0)