Skip to content

Commit 55778d9

Browse files
committed
More steam fixes
1 parent da9d68a commit 55778d9

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

ddnet-lib-update.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ make -j4
3636
cp .libs/libopusfile.a ..
3737

3838
cd ../SDL2-2.0.12
39-
./configure CFLAGS=-fPIC
39+
./configure --enable-input-tslib=no CFLAGS=-fPIC
4040
CFLAGS=-fPIC make -j4
4141
cp build/.libs/libSDL2-2.0.so.0.12.0 ../libSDL2-2.0.so.0
4242
strip -s ../libSDL2-2.0.so.0
@@ -66,7 +66,7 @@ CFLAGS=-m32 LDFLAGS=-m32 make -j4
6666
cp .libs/libopusfile.a ..
6767

6868
cd ../SDL2-2.0.12
69-
./configure CFLAGS=-fPIC
69+
./configure --enable-input-tslib=no CFLAGS=-fPIC
7070
CFLAGS=-fPIC make -j4
7171
cp build/.libs/libSDL2-2.0.so.0.12.0 ../libSDL2-2.0.so.0
7272
strip -s ../libSDL2-2.0.so.0

ddnet-release.sh

+18-6
Original file line numberDiff line numberDiff line change
@@ -181,25 +181,37 @@ cd steam
181181
unzip $BUILDS/DDNet-$VERSION-win64.zip
182182
mv DDNet-$VERSION-win64/data data
183183
zip -9r DDNet-$VERSION-data.zip data
184-
zip -9r DDNet-$VERSION-win64.zip DDNet-$VERSION-win64
184+
mv DDNet-$VERSION-win64 ddnet
185+
zip -9r DDNet-$VERSION-win64.zip ddnet
186+
rm -r ddnet
185187

186188
unzip $BUILDS/DDNet-$VERSION-win32.zip
187189
rm -r DDNet-$VERSION-win32/data
188-
zip -9r DDNet-$VERSION-win32.zip DDNet-$VERSION-win32
190+
mv DDNet-$VERSION-win32 ddnet
191+
zip -9r DDNet-$VERSION-win32.zip ddnet
192+
rm -r ddnet
189193

190194
tar xvf $BUILDS/DDNet-$VERSION-linux_x86_64.tar.xz
191195
rm -r DDNet-$VERSION-linux_x86_64/data
192196
cp $BUILDDIR/ddnet-master/ddnet-libs/sdl/linux/lib64/libSDL2-2.0.so.0 DDNet-$VERSION-linux_x86_64
193-
zip -9r DDNet-$VERSION-linux_x86_64.zip DDNet-$VERSION-linux_x86_64
197+
mv DDNet-$VERSION-linux_x86_64 ddnet
198+
zip -9r DDNet-$VERSION-linux_x86_64.zip ddnet
199+
rm -r ddnet
194200

195201
tar xvf $BUILDS/DDNet-$VERSION-linux_x86.tar.xz
196202
rm -r DDNet-$VERSION-linux_x86/data
197-
cp $BUILDDIR/ddnet-master/ddnet-libs/sdl/linux/lib32/libSDL2-2.0.so.0 DDNet-$VERSION-linux_x86_32
198-
zip -9r DDNet-$VERSION-linux_x86.zip DDNet-$VERSION-linux_x86
203+
cp $BUILDDIR/ddnet-master/ddnet-libs/sdl/linux/lib32/libSDL2-2.0.so.0 DDNet-$VERSION-linux_x86
204+
mv DDNet-$VERSION-linux_x86 ddnet
205+
zip -9r DDNet-$VERSION-linux_x86.zip ddnet
206+
rm -r ddnet
199207

200208
7z x $BUILDS/DDNet-$VERSION-osx.dmg # might have problems with symlinks
201209
rm -r DDNet-$VERSION-osx/DDNet.app/Contents/Resources/data DDNet-$VERSION-osx/DDNet-Server.app/Contents/Resources/data
202-
zip -9r DDNet-$VERSION-osx.zip DDNet-$VERSION-osx
210+
mkdir ddnet
211+
mv DDNet-$VERSION-osx/DDNet.app/Contents/MacOS/DDNet DDNet-$VERSION-osx/DDNet-Server.app/Contents/MacOS/DDNet-Server ddnet
212+
mv DDNet-$VERSION-osx/DDNet.app/Contents/Frameworks .
213+
zip -9r DDNet-$VERSION-osx.zip ddnet Frameworks
214+
rm -r ddnet
203215

204216
rm -rf ddnet-master
205217

0 commit comments

Comments
 (0)