Merge pull request #299 from Wieku/dev

Fix compilation failing on linux
Wieku · Nov 27, 2022 · e30c81f · e30c81f
2 parents 850c45f + e51c3b5
commit e30c81f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/dist-linux.sh b/dist-linux.sh
@@ -22,15 +22,14 @@ go run tools/assets/assets.go ./ $BUILD_DIR/
 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
 
 mv $BUILD_DIR/danser-core.so $BUILD_DIR/libdanser-core.so
+cp {libbass.so,libbass_fx.so,libbassmix.so,libyuv.so} $BUILD_DIR/
 
 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
 
 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
 
 rm $BUILD_DIR/danser-core.h
 
-cp {libbass.so,libbass_fx.so,libbassmix.so,libyuv.so} $BUILD_DIR/
-
 go run tools/ffmpeg/ffmpeg.go $BUILD_DIR/
 
 mkdir -p $TARGET_DIR

diff --git a/dist-win.sh b/dist-win.sh
@@ -71,14 +71,14 @@ rm -f danser.syso
 
 $resgen <<< $resDanser
 
+cp {bass.dll,bass_fx.dll,bassmix.dll,libyuv.dll} $BUILD_DIR/
+
 $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
 
 $resgen <<< $resLauncher
 
 $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
 
-cp {bass.dll,bass_fx.dll,bassmix.dll,libyuv.dll} $BUILD_DIR/
-
 rm $BUILD_DIR/{danser.syso,danser-core.h}
 
 go run tools/ffmpeg/ffmpeg.go $BUILD_DIR/