Fix building vorbis on Windows
Some checks failed
Build Android / Game (Android, Release ARM64) (push) Has been cancelled
Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled
Build Linux / Editor (Linux, Development x64) (push) Has been cancelled
Build Linux / Game (Linux, Release x64) (push) Has been cancelled
Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled
Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled
Build Windows / Editor (Windows, Development x64) (push) Has been cancelled
Build Windows / Game (Windows, Release x64) (push) Has been cancelled
Cooker / Cook (Mac) (push) Has been cancelled
Tests / Tests (Linux) (push) Has been cancelled
Tests / Tests (Windows) (push) Has been cancelled
Some checks failed
Build Android / Game (Android, Release ARM64) (push) Has been cancelled
Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled
Build Linux / Editor (Linux, Development x64) (push) Has been cancelled
Build Linux / Game (Linux, Release x64) (push) Has been cancelled
Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled
Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled
Build Windows / Editor (Windows, Development x64) (push) Has been cancelled
Build Windows / Game (Windows, Release x64) (push) Has been cancelled
Cooker / Cook (Mac) (push) Has been cancelled
Tests / Tests (Linux) (push) Has been cancelled
Tests / Tests (Windows) (push) Has been cancelled
This commit is contained in:
@@ -295,6 +295,7 @@ namespace Flax.Deps.Dependencies
|
|||||||
string ext;
|
string ext;
|
||||||
string oggConfig = $"-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE={_configuration} -DCMAKE_INSTALL_PREFIX=\"{installDir}\"";
|
string oggConfig = $"-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE={_configuration} -DCMAKE_INSTALL_PREFIX=\"{installDir}\"";
|
||||||
string vorbisConfig = $"-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE={_configuration} -DCMAKE_INSTALL_PREFIX=\"{installDir}\"";
|
string vorbisConfig = $"-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE={_configuration} -DCMAKE_INSTALL_PREFIX=\"{installDir}\"";
|
||||||
|
string liboggFilename = "libogg";
|
||||||
Dictionary<string, string> envVars = new Dictionary<string, string>();
|
Dictionary<string, string> envVars = new Dictionary<string, string>();
|
||||||
(string, string)[] oggBinariesToCopy;
|
(string, string)[] oggBinariesToCopy;
|
||||||
Binary[] vorbisBinariesToCopy;
|
Binary[] vorbisBinariesToCopy;
|
||||||
@@ -306,6 +307,7 @@ namespace Flax.Deps.Dependencies
|
|||||||
oggConfig += " -DBUILD_SHARED_LIBS=OFF";
|
oggConfig += " -DBUILD_SHARED_LIBS=OFF";
|
||||||
vorbisConfig += " -DBUILD_SHARED_LIBS=OFF";
|
vorbisConfig += " -DBUILD_SHARED_LIBS=OFF";
|
||||||
ext = ".lib";
|
ext = ".lib";
|
||||||
|
liboggFilename = "ogg";
|
||||||
break;
|
break;
|
||||||
case TargetPlatform.Linux:
|
case TargetPlatform.Linux:
|
||||||
oggConfig += " -DCMAKE_POSITION_INDEPENDENT_CODE=ON";
|
oggConfig += " -DCMAKE_POSITION_INDEPENDENT_CODE=ON";
|
||||||
@@ -355,7 +357,7 @@ namespace Flax.Deps.Dependencies
|
|||||||
default: throw new InvalidPlatformException(platform);
|
default: throw new InvalidPlatformException(platform);
|
||||||
}
|
}
|
||||||
|
|
||||||
vorbisConfig += $" -DOGG_INCLUDE_DIR=\"{Path.Combine(installDir, "include")}\" -DOGG_LIBRARY=\"{Path.Combine(installDir, "lib", "libogg" + ext)}\"";
|
vorbisConfig += $" -DOGG_INCLUDE_DIR=\"{Path.Combine(installDir, "include")}\" -DOGG_LIBRARY=\"{Path.Combine(installDir, "lib", liboggFilename + ext)}\"";
|
||||||
|
|
||||||
var binariesToCopy = new List<(string, string)>();
|
var binariesToCopy = new List<(string, string)>();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user