Fix undefined libcrypto symbols on Linux builds

This commit is contained in:
ChronicallySerious
2021-12-01 00:42:45 +05:30
parent af8149ffa9
commit c48f2efadc
6 changed files with 6 additions and 4 deletions

1
.gitignore vendored
View File

@@ -22,6 +22,7 @@ win64/
*.lib
*.a
*.obj
*.os
*.ilk
*.pdb
!thirdparty/openssl/*

View File

@@ -17,6 +17,7 @@ This section onwards is only meant to be used if you intend to compile the plugi
### Required Tools
- Full copy of the source code. Remember to use `git clone --recursive`.
- [SCons](https://scons.org/pages/download.html) (v3.0.1+)
- C++17 and C90 compilers detectable by SCons and present in `PATH`.
- Platforms Specific Setup
@@ -37,7 +38,7 @@ For more build options, run `scons platform=<platform> -h`
## Bleeding Edge
Most of the times when new featured are being worked on for the Godot VCS Integration, this requires making changes inside of the Godot Editor source code along with this plugin. Thus, this means we need to manually generate the GDNative API from these newer Godot builds and then use them with godot-cpp.
Most of the times when new features are being worked on for the Godot VCS Integration, it requires developers to make changes in the Godot Editor source code along with this plugin. This means we need to manually generate the GDNative API from the custom Godot builds and then use it to compile godot-cpp.
To build using custom GDNative API definition JSON files, run the below helper command:
@@ -45,7 +46,7 @@ To build using custom GDNative API definition JSON files, run the below helper c
scons platform=<platform> target=debug godot_cpp=yes generate_bindings=yes bits=64 use_custom_api_file=yes custom_api_file=path/to/api.json -j 6
```
Once this command can completed successfully, the standard build commands in the above section can be run without recompiling godot-cpp. To stop godot-cpp from recompiling, do not use the `godot_cpp` option in SCons arguments. To view more options available while recompiling godot-cpp, run `scons platform=<platform> godot_cpp=yes -h`
Once this command can completed successfully, the standard build commands in the above section can be run without recompiling godot-cpp. To stop godot-cpp from recompiling, do not use the `godot_cpp` option in SCons arguments. To view more options available while recompiling godot-cpp, run `scons platform=<platform> godot_cpp=yes -h`.
---

View File

@@ -45,7 +45,7 @@ if env["platform"] == "osx":
elif env["platform"] == "linux":
env["target_path"] += "linux/"
cpp_library += ".linux"
env.Append(LIBS=["ssl"])
env.Append(LIBS=["ssl", "crypto"])
if env["target"] in ("debug", "d"):
env.Append(CCFLAGS=["-fPIC", "-g3", "-Og", "-std=c++17"])
@@ -84,7 +84,7 @@ env.Append(CPPPATH=[godot_headers_path, cpp_bindings_path + "include/",
cpp_bindings_path + "include/core/", cpp_bindings_path + "include/gen/"])
env.Append(CPPPATH=["../thirdparty/git2/libgit2/include/"])
env.Append(LIBPATH=[cpp_bindings_path + "bin/", "../thirdparty/bin/"])
env.Append(LIBS=[cpp_library, "git2", "ssh2"])
env.Prepend(LIBS=[cpp_library, "git2", "ssh2"])
library = env.SharedLibrary(
target=env["target_path"] + env["target_name"],

Binary file not shown.

Binary file not shown.

Binary file not shown.