Skip to content

Commit

Permalink
Use OpenSSL on windows too, build libgit2, ssh2 with cmake.
Browse files Browse the repository at this point in the history
And update the libraries.
  • Loading branch information
Faless committed Jul 17, 2023
1 parent 3eff06f commit e21ca08
Show file tree
Hide file tree
Showing 11 changed files with 265 additions and 257 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
python-version: "3.x"
architecture: "x64"
- uses: ilammy/msvc-dev-cmd@v1
- uses: ilammy/setup-nasm@v1
- name: build-windows-editor-x64
run: |
git submodule update --init --recursive
Expand Down
16 changes: 11 additions & 5 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,27 @@ if ARGUMENTS.get("custom_api_file", "") != "":

ARGUMENTS["target"] = "editor"
env = SConscript("godot-cpp/SConstruct").Clone()
env.PrependENVPath("PATH", os.getenv("PATH")) # Prepend PATH, done upstream in recent godot-cpp verions.

# OpenSSL Builder
env.Tool("openssl", toolpath=["tools"])

# SSH2 Builder
env.Tool("cmake", toolpath=["tools"])
env.Tool("ssh2", toolpath=["tools"])
env.Tool("git2", toolpath=["tools"])

opts.Update(env)

if env["platform"] != "windows": # Windows does not need OpenSSL
ssl = env.OpenSSL()
else:
ssl = []
ssl = env.OpenSSL()
ssh2 = env.BuildSSH2(ssl)
ssl += ssh2
git2 = env.BuildGIT2(ssl)

Export("ssl")
Export("env")

SConscript("thirdparty/SCsub")
#SConscript("thirdparty/SCsub")

SConscript("godot-git-plugin/SCsub")

Expand Down
4 changes: 1 addition & 3 deletions godot-git-plugin/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ elif env["platform"] == "windows":

env.Append(CPPPATH=[".", "src/"])

env.Append(CPPPATH=["../thirdparty/git2/libgit2/include/"])
env.Append(LIBPATH=["../thirdparty/bin/"])
env.Prepend(LIBS=["git2", "ssh2"])
env.Append(CPPPATH=["#thirdparty/git2/libgit2/include/"])

lib_sources = Glob("src/*.cpp")
env.Depends(lib_sources, ssl)
Expand Down
6 changes: 0 additions & 6 deletions thirdparty/SCsub

This file was deleted.

131 changes: 0 additions & 131 deletions thirdparty/git2/SCsub

This file was deleted.

2 changes: 1 addition & 1 deletion thirdparty/git2/libgit2
Submodule libgit2 updated 1695 files
110 changes: 0 additions & 110 deletions thirdparty/ssh2/SCsub

This file was deleted.

2 changes: 1 addition & 1 deletion thirdparty/ssh2/libssh2
Submodule libssh2 updated 440 files
Loading

0 comments on commit e21ca08

Please sign in to comment.