Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Add curl for Editor on Linux

Browse Source
This commit is contained in:
Wojciech Figat
2021-01-10 22:15:13 +01:00
parent 8d7d2431df
commit 7bbf089e9f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -42,7 +42,7 @@ Follow the instructions below to compile and run the engine from source.
* Install Visual Studio Code * Install Visual Studio Code
* Install Mono ([https://www.mono-project.com/download/stable](https://www.mono-project.com/download/stable)) * Install Mono ([https://www.mono-project.com/download/stable](https://www.mono-project.com/download/stable))
* Install Git with LFS * Install Git with LFS
* Install requried packages: `sudo apt-get install nuget autoconf libtool libogg-dev automake build-essential gettext cmake python curl libtool-bin libx11-dev libpulse-dev libasound2-dev libjack-dev portaudio19-dev` * Install requried packages: `sudo apt-get install nuget autoconf libtool libogg-dev automake build-essential gettext cmake python curl libtool-bin libx11-dev libpulse-dev libasound2-dev libjack-dev portaudio19-dev libcurl4-gnutls-dev`
* Install compiler `sudo apt-get install clang-7 lldb-7 lld-7` * Install compiler `sudo apt-get install clang-7 lldb-7 lld-7`
* Clone repo (with LFS) * Clone repo (with LFS)
* Run `sudo bash GenerateProjectFiles.sh` * Run `sudo bash GenerateProjectFiles.sh`
Source/ThirdParty/curl/curl.Build.cs
Vendored
+2 -1
View File
@@ -24,10 +24,10 @@ public class curl : DepsModule
base.Setup(options); base.Setup(options);
var depsRoot = options.DepsFolder; var depsRoot = options.DepsFolder;
options.PublicDefinitions.Add("CURL_STATICLIB");
switch (options.Platform.Target) switch (options.Platform.Target)
{ {
case TargetPlatform.Windows: case TargetPlatform.Windows:
options.PublicDefinitions.Add("CURL_STATICLIB");
options.OutputFiles.Add(Path.Combine(depsRoot, "libcurl.lib")); options.OutputFiles.Add(Path.Combine(depsRoot, "libcurl.lib"));
options.OptionalDependencyFiles.Add(Path.Combine(depsRoot, "libcurl.pdb")); options.OptionalDependencyFiles.Add(Path.Combine(depsRoot, "libcurl.pdb"));
options.OutputFiles.Add("ws2_32.lib"); options.OutputFiles.Add("ws2_32.lib");
@@ -35,6 +35,7 @@ public class curl : DepsModule
options.OutputFiles.Add("crypt32.lib"); options.OutputFiles.Add("crypt32.lib");
break; break;
case TargetPlatform.Linux: case TargetPlatform.Linux:
options.Libraries.Add("curl");
break; break;
default: throw new InvalidPlatformException(options.Platform.Target); default: throw new InvalidPlatformException(options.Platform.Target);
} }