Skip to content

Commit 289d6a6

Browse files
committed
use latest crtls & rules
1 parent c33f389 commit 289d6a6

4 files changed

Lines changed: 15 additions & 19 deletions

File tree

build-devkit.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ echo
2828

2929

3030

31-
DKARM_RULES_VER=1.2.0
32-
DKARM_CRTLS_VER=1.0.0
31+
DKARM_RULES_VER=1.2.1
32+
DKARM_CRTLS_VER=1.1.1
3333

34-
DKPPC_RULES_VER=1.0.0
34+
DKPPC_RULES_VER=1.1.0
3535

36-
DKA64_RULES_VER=1.0.0
36+
DKA64_RULES_VER=1.0.1
3737

3838
OSXMIN=${OSXMIN:-10.9}
3939

@@ -189,15 +189,15 @@ fi
189189

190190
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
191191
if [ $VERSION -eq 1 ]; then
192-
archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
192+
archives="devkitarm-rules-$DKARM_RULES_VER.tar.gz devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz $archives"
193193
fi
194194

195195
if [ $VERSION -eq 2 ]; then
196-
archives="devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
196+
archives="devkitppc-rules-$DKPPC_RULES_VER.tar.gz $archives"
197197
fi
198198

199199
if [ $VERSION -eq 3 ]; then
200-
archives="devkita64-rules-$DKA64_RULES_VER.tar.xz $archives"
200+
archives="devkita64-rules-$DKA64_RULES_VER.tar.gz $archives"
201201
fi
202202
fi
203203

dka64/scripts/build-crtls.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export DEVKITPRO=$TOOLPATH
1010
#---------------------------------------------------------------------------------
1111
cd $BUILDDIR
1212

13-
mkdir -p rules
14-
cd rules
15-
tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.xz
13+
tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.gz
14+
cd devkita64-rules-$DKA64_RULES_VER
1615
make install

dkarm-eabi/scripts/build-crtls.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ export DEVKITARM=$DEVKITPRO/devkitARM
1111
#---------------------------------------------------------------------------------
1212
cd $BUILDDIR
1313

14-
mkdir -p rules
15-
cd rules
16-
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
14+
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.gz
15+
cd devkitarm-rules-$DKARM_RULES_VER
1716
make install
1817

1918
#---------------------------------------------------------------------------------
2019
# Install and build the crt0 files
2120
#---------------------------------------------------------------------------------
2221
cd $BUILDDIR
2322

24-
mkdir -p crtls
25-
cd crtls
26-
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
23+
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz
24+
cd devkitarm-crtls-$DKARM_CRTLS_VER
2725
make install
2826

dkppc/scripts/build-crtls.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export DEVKITPPC=$DEVKITPRO/devkitPPC
1111
#---------------------------------------------------------------------------------
1212
cd $BUILDDIR
1313

14-
mkdir -p rules
15-
cd rules
16-
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
14+
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.gz
15+
cd devkitppc-rules-$DKPPC_RULES_VER
1716
make install

0 commit comments

Comments
 (0)