Update godot-cpp for 4.0.2-stable

matrixant · May 29, 2023 · 70ff8b2 · 70ff8b2
1 parent 75ce9fc
commit 70ff8b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/SCsub b/SCsub
@@ -15,17 +15,18 @@ serial_sources = ["src/serial.cc"]
 if env["platform"] == "windows":
     serial_sources.append("src/impl/win.cc")
     serial_sources.append("src/impl/list_ports/list_ports_win.cc")
-    if env.msvc:
-        env.Append(LINKFLAGS=["setupapi.lib"])
+    if env.get("is_msvc", True):
+        env.Append(LINKFLAGS=["setupapi.lib", "Advapi32.lib"])
     else:
-        env.Append(LIBS=["setupapi"])
-elif env["platform"] == "linuxbsd":
-    # if env["x11"]:
+        env.Append(LIBS=["setupapi", "Advapi32"])
+elif env["platform"].startswith("linux"):
     serial_sources.append("src/impl/unix.cc")
     serial_sources.append("src/impl/list_ports/list_ports_linux.cc")
+    env.Append(LIBS=["rt", "pthread"])
 elif env["platform"] == "osx":
     serial_sources.append("src/impl/unix.cc")
     serial_sources.append("src/impl/list_ports/list_ports_osx.cc")
+print("Build for {0}.".format(env["platform"]))
 
 serial_sources = [serial_dir + file for file in serial_sources]
 

diff --git a/gdextension_build/SConstruct b/gdextension_build/SConstruct
@@ -22,12 +22,14 @@ if env["platform"] == "windows":
         env.Append(LINKFLAGS=["setupapi.lib", "Advapi32.lib"])
     else:
         env.Append(LIBS=["setupapi", "Advapi32"])
-elif env["platform"] == "linuxbsd":
+elif env["platform"].startswith("linux"):
     serial_sources.append("src/impl/unix.cc")
     serial_sources.append("src/impl/list_ports/list_ports_linux.cc")
+    env.Append(LIBS=["rt", "pthread"])
 elif env["platform"] == "macos":
     serial_sources.append("src/impl/unix.cc")
     serial_sources.append("src/impl/list_ports/list_ports_osx.cc")
+print("Build for {0}.".format(env["platform"]))
 
 serial_sources = [serial_dir + file for file in serial_sources]
 

diff --git a/godot-cpp b/godot-cpp