Skip to content

Commit e30c81f

Browse files
authored
Merge pull request #299 from Wieku/dev
Fix compilation failing on linux
2 parents 850c45f + e51c3b5 commit e30c81f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

dist-linux.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ go run tools/assets/assets.go ./ $BUILD_DIR/
2222
go build -trimpath -ldflags "-s -w -X 'github.com/wieku/danser-go/build.VERSION=$build' -X 'github.com/wieku/danser-go/build.Stream=Release'" -buildmode=c-shared -o $BUILD_DIR/danser-core.so -v -x
2323

2424
mv $BUILD_DIR/danser-core.so $BUILD_DIR/libdanser-core.so
25+
cp {libbass.so,libbass_fx.so,libbassmix.so,libyuv.so} $BUILD_DIR/
2526

2627
gcc -no-pie --verbose -O3 -o $BUILD_DIR/danser-cli -I. cmain/main_danser.c -I$BUILD_DIR/ -Wl,-rpath,'$ORIGIN' -L$BUILD_DIR/ -ldanser-core
2728

2829
gcc -no-pie --verbose -O3 -D LAUNCHER -o $BUILD_DIR/danser -I. cmain/main_danser.c -I$BUILD_DIR/ -Wl,-rpath,'$ORIGIN' -L$BUILD_DIR/ -ldanser-core
2930

3031
rm $BUILD_DIR/danser-core.h
3132

32-
cp {libbass.so,libbass_fx.so,libbassmix.so,libyuv.so} $BUILD_DIR/
33-
3433
go run tools/ffmpeg/ffmpeg.go $BUILD_DIR/
3534

3635
mkdir -p $TARGET_DIR

dist-win.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ rm -f danser.syso
7171

7272
$resgen <<< $resDanser
7373

74+
cp {bass.dll,bass_fx.dll,bassmix.dll,libyuv.dll} $BUILD_DIR/
75+
7476
$CC <<< --verbose -O3 -o $BUILD_DIR/danser-cli.exe -I. cmain/main_danser.c -I$BUILD_DIR/ -L$BUILD_DIR/ -ldanser-core $BUILD_DIR/danser.syso -municode
7577

7678
$resgen <<< $resLauncher
7779

7880
$CC <<< --verbose -O3 -D LAUNCHER -o $BUILD_DIR/danser.exe -I. cmain/main_danser.c -I$BUILD_DIR/ -L$BUILD_DIR/ -ldanser-core $BUILD_DIR/danser.syso -municode
7981

80-
cp {bass.dll,bass_fx.dll,bassmix.dll,libyuv.dll} $BUILD_DIR/
81-
8282
rm $BUILD_DIR/{danser.syso,danser-core.h}
8383

8484
go run tools/ffmpeg/ffmpeg.go $BUILD_DIR/

0 commit comments

Comments
 (0)