Skip to content

Commit

Permalink
Fix compilation failing on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Wieku committed Nov 27, 2022
1 parent 850c45f commit e51c3b5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions dist-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dist-win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit e51c3b5

Please sign in to comment.