Merge pull request #199 from Faless/build/openssl_and_cmake

Use OpenSSL on windows too, build libgit2, ssh2 with cmake.

Author: akien-mga

.github/workflows/build.yml

@@ -46,6 +46,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: |
           pip3 install --user scons

.gitmodules

@@ -2,7 +2,7 @@
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp
 	branch = 3.x
-[submodule "libgit2"]
+[submodule "thirdparty/git2/libgit2"]
 	path = thirdparty/git2/libgit2
 	url = https://github.com/libgit2/libgit2
 	ignore = untracked

SConstruct

@@ -23,22 +23,26 @@ 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("godot-git-plugin/SCsub")
 
 # Generates help for the -h scons option.

godot-git-plugin/SCsub

@@ -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)