Don't use V8 by default anymore when doing release or debug builds.

sysfce2 · Dec 29, 2021 · 97a7f70 · 97a7f70
1 parent 687515c
commit 97a7f70
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 39 deletions.
diff --git a/.github/workflows/tools/build-appimage b/.github/workflows/tools/build-appimage
@@ -51,8 +51,8 @@ CONFIG="release,bundledlibbz2,bundledlibfribidi,bundledlibjpeg,bundledlibpng,bun
 
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/$HOST/pkgconfig
 
-make config=$CONFIG BUILD_V8=False -j$jobs
-sudo make config=$CONFIG BUILD_V8=False install
+make config=$CONFIG -j$jobs
+sudo make config=$CONFIG install
 
 unset PKG_CONFIG_PATH
 
@@ -90,8 +90,8 @@ cd ..
 # Build fre:ac
 CONFIG="release"
 
-make config=$CONFIG USE_V8=False -j$jobs
-sudo make config=$CONFIG USE_V8=False install
+make config=$CONFIG -j$jobs
+sudo make config=$CONFIG install
 
 # Build codecs and DSP libraries
 cd tools

diff --git a/.github/workflows/tools/build-macos b/.github/workflows/tools/build-macos
@@ -35,8 +35,8 @@ cd smooth
 
 CONFIG="release"
 
-make config=$CONFIG BUILD_V8=False -j$jobs
-sudo make config=$CONFIG BUILD_V8=False install
+make config=$CONFIG -j$jobs
+sudo make config=$CONFIG install
 
 cd ..
 
@@ -53,8 +53,8 @@ cd ..
 # Build fre:ac
 CONFIG="release"
 
-make config=$CONFIG USE_V8=False -j$jobs
-sudo make config=$CONFIG USE_V8=False install
+make config=$CONFIG -j$jobs
+sudo make config=$CONFIG install
 
 # Build codecs and DSP libraries
 cd tools

diff --git a/.github/workflows/tools/build-windows b/.github/workflows/tools/build-windows
@@ -25,7 +25,7 @@ cd smooth
 
 CONFIG="release"
 
-make config=$CONFIG BUILD_V8=False -j$jobs
+make config=$CONFIG -j$jobs
 
 mkdir -p ../boca/$LIB
 cp $LIB/libsmooth.a ../boca/$LIB
@@ -75,7 +75,7 @@ cd ..
 # Build fre:ac
 CONFIG="release"
 
-make config=$CONFIG USE_V8=False -j$jobs
+make config=$CONFIG -j$jobs
 
 # Build codecs and DSP libraries
 cd tools

diff --git a/Makefile-options b/Makefile-options
@@ -299,17 +299,6 @@ ifeq ($(findstring release,$(config)),release)
 		override LDFLAGS += -Wl,-rpath,.
 	endif
 	endif
-
-	# Use V8 when building on a supported platform
-	ifeq ($(BUILD_X86),True)
-		USE_V8 = True
-	else ifeq ($(BUILD_X86_64),True)
-		USE_V8 = True
-	else ifeq ($(BUILD_ARM),True)
-		USE_V8 = True
-	else ifeq ($(BUILD_MIPS),True)
-		USE_V8 = True
-	endif
 endif
 
 # Set debug specific options
@@ -341,17 +330,6 @@ ifeq ($(findstring debug,$(config)),debug)
 		override LDFLAGS += -Wl,-rpath,.
 	endif
 	endif
-
-	# Use V8 when building on a supported platform
-	ifeq ($(BUILD_X86),True)
-		USE_V8 = True
-	else ifeq ($(BUILD_X86_64),True)
-		USE_V8 = True
-	else ifeq ($(BUILD_ARM),True)
-		USE_V8 = True
-	else ifeq ($(BUILD_MIPS),True)
-		USE_V8 = True
-	endif
 endif
 
 # Flags needed for Windows ARM64 toolchain

diff --git a/packaging/macosx/prepare.sh b/packaging/macosx/prepare.sh
@@ -25,7 +25,6 @@ cp $PREFIX/bin/freaccmd freac.app/Contents/MacOS/
 
 cp $PREFIX/lib/libboca-$BOCAVER.dylib freac.app/Contents/Frameworks/
 cp $PREFIX/lib/libsmooth-$SMOOTHVER.dylib freac.app/Contents/Frameworks/
-#cp $PREFIX/lib/libsmooth-js-$SMOOTHVER.dylib freac.app/Contents/Frameworks/
 
 cp $PREFIX/lib/libsmooth-$SMOOTHVER.dylib freac.app/Contents/Resources/translator.app/Contents/Frameworks/
 
@@ -52,7 +51,6 @@ cp $PREFIX/lib/boca/boca_*.1.0.xml freac.app/Contents/Resources/boca/
 cp -R $PREFIX/lib/freac/freac.extension.donate freac.app/Contents/Resources/boca/
 cp -R $PREFIX/lib/freac/freac.extension.langnotify freac.app/Contents/Resources/boca/
 cp -R $PREFIX/lib/freac/freac.extension.notifier freac.app/Contents/Resources/boca/
-#cp -R $PREFIX/lib/freac/freac.extension.youtube freac.app/Contents/Resources/boca/
 
 cp $PREFIX/lib/freac/freac_extension_*.1.0.dylib freac.app/Contents/Resources/boca/
 cp $PREFIX/lib/freac/freac_verifier_*.1.0.dylib freac.app/Contents/Resources/boca/
@@ -90,13 +88,10 @@ rm freac.app/Contents/Resources/boca/boca_decoder_ffmpeg_mpc.1.0.xml
 rm freac.app/Contents/Resources/boca/boca_decoder_ffmpeg_wavpack.1.0.xml
 rm freac.app/Contents/Resources/boca/boca_encoder_ffmpeg_alac.1.0.xml
 
-rm freac.app/Contents/Resources/boca/freac_extension_youtube.1.0.dylib
-
 # Fix library names
 install_name_tool -change libsmooth-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-$SMOOTHVER.dylib freac.app/Contents/MacOS/freac
 install_name_tool -change libsmooth-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-$SMOOTHVER.dylib freac.app/Contents/MacOS/freaccmd
 install_name_tool -change libsmooth-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-$SMOOTHVER.dylib freac.app/Contents/Frameworks/libboca-$BOCAVER.dylib
-#install_name_tool -change libsmooth-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-$SMOOTHVER.dylib freac.app/Contents/Frameworks/libsmooth-js-$SMOOTHVER.dylib
 
 install_name_tool -change libboca-$BOCAVER.dylib @executable_path/../Frameworks/libboca-$BOCAVER.dylib freac.app/Contents/Resources/freac.dylib
 install_name_tool -change libsmooth-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-$SMOOTHVER.dylib freac.app/Contents/Resources/freac.dylib
@@ -113,8 +108,6 @@ install_name_tool -change $PREFIX/lib/libcdio.19.dylib @executable_path/../Resou
 find freac.app/Contents/Resources/boca -name freac_*.dylib | xargs -I $ install_name_tool -change libboca-$BOCAVER.dylib @executable_path/../Frameworks/libboca-$BOCAVER.dylib $
 find freac.app/Contents/Resources/boca -name freac_*.dylib | xargs -I $ install_name_tool -change libsmooth-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-$SMOOTHVER.dylib $
 
-#install_name_tool -change libsmooth-js-$SMOOTHVER.dylib @executable_path/../Frameworks/libsmooth-js-$SMOOTHVER.dylib freac.app/Contents/Resources/boca/freac_extension_youtube.1.0.dylib
-
 install_name_tool -change $PREFIX/lib/libcdio.19.dylib @executable_path/../Resources/cdio.dylib freac.app/Contents/Resources/cdio_cdda.dylib
 
 install_name_tool -change $PREFIX/lib/libcdio.19.dylib @executable_path/../Resources/cdio.dylib freac.app/Contents/Resources/cdio_paranoia.dylib