From fe6eab7f211485b6baf74b067ec38a7081270908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Seta?= <djiamnot@gmail.com>
Date: Sun, 28 Oct 2018 19:03:17 -0400
Subject: [PATCH] fix SConstruct to make compilation happen correctly

---
 README.md  | 10 ++++++++++
 SConstruct | 31 ++++++++++---------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index fb69e1a..eed91c4 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,16 @@ Also, in the console, possibly related to Frankie's *todo* point #4
 ERROR: _load: Failed loading resource: res://bin/OSCreceiver.gdns
 ```
 
+### 2018-10-28
+
+#### done
+
+* fix SConstruct. Demo project loads without errors
+
+#### ToDo
+
+* review compilation warnings...
+
 ## links
 
 * https://gamedevadventures.posthaven.com/using-c-plus-plus-and-gdnative-in-godot-part-1
diff --git a/SConstruct b/SConstruct
index 26cea05..004d6b1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
+
 import os
 
+
 target = ARGUMENTS.get("target", "debug")
 platform = ARGUMENTS.get("platform", "windows")
 bits = ARGUMENTS.get("bits", 64)
@@ -44,29 +46,16 @@ elif platform == "windows":
 
 	final_lib_path = final_lib_path + 'win' + str(bits) + '/'
 
-env.Append(CPPPATH=['.', 'src/', 'src/oscpack/', 'src/oscpack/osc/', 'src/oscpack/ip/', ip_path, "godot-cpp/godot_headers/", 'godot-cpp/include/', 'godot-cpp/include/core/'])
-env.Append(LIBPATH="godot-cpp/bin")
-# env.Append(LIBS=["godot-cpp" + "." + platform + "." + str(bits)])
-
-# add oscpack
-env.Append(LIBPATH="#src/oscpack")
-env.Append( CPPPATH=["src/oscpack",'src/oscpack/osc', "src/oscpack/ip"])
-env.Append(LIBPATH="#src/oscpack/ip")
-# the following line is definitely not platform independent.
-env.Append(LINKFLAGS=[
-    "src/oscpack/osc/OscOutboundPacketStream.os",
-    "src/oscpack/osc/OscTypes.os",
-    "src/oscpack/ip/{}/UdpSocket.os".format(ip_system_type)
-])
-
-env.Append(LIBPATH='#src/oscpack/ip/{0}' .format(ip_system_type))
-
 sources = []
 add_sources(sources, "src")
-# add_sources(sources, "src/oscpack/")
-# add_sources(sources, "src/oscpack/osc/")
-# add_sources(sources, "src/oscpack/ip/")
-# add_sources(sources, ip_path)
+add_sources(sources, "src/oscpack/ip/")
+add_sources(sources, "src/oscpack/osc/")
+add_sources(sources, "src/oscpack/ip/{}".format(ip_system_type))
+
+env.Append(CPPPATH=['.', 'src/', 'src/oscpack/', 'src/oscpack/osc/', 'src/oscpack/ip/', 'src/oscpack/ip/{}'.format(ip_system_type), "godot-cpp/godot_headers/", 'godot-cpp/include/', 'godot-cpp/include/core/'])
+env.Append(LIBPATH=["src/oscpac", "src/oscpac/ip", "src/oscpack/ip/{}".format(ip_system_type)])
+env.Append(LIBPATH="godot-cpp/bin")
+env.Append(LIBS=["godot-cpp" + "." + platform + "." + str(bits)])
 
 library = env.SharedLibrary(target=final_lib_path + 'libgdosc', source=sources)
 Default(library)
-- 
GitLab