From 0033fb160bab8fe823bb00be17410ac0ebbc4411 Mon Sep 17 00:00:00 2001 From: Ed94 Date: Thu, 12 May 2022 09:06:22 -0400 Subject: [PATCH] nvm was another issue. --- .gitignore | 5 ++++- .gitmodules | 3 +++ Engine/gdnative_cpp | 1 + Source/.sconsign.dblite | Bin 4889 -> 0 bytes Source/SConstruct | 14 +++++++------- Source/vc140.idb | Bin 11264 -> 11264 bytes Source/vc140.pdb | Bin 82944 -> 82944 bytes 7 files changed, 15 insertions(+), 8 deletions(-) create mode 160000 Engine/gdnative_cpp delete mode 100644 Source/.sconsign.dblite diff --git a/.gitignore b/.gitignore index 53b465a..79a845d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,7 @@ mono_crash.*.json .history/ # Built Visual Studio Code Extensions -*.vsix \ No newline at end of file +*.vsix + +# Fork +Source/.sconsign.dblite diff --git a/.gitmodules b/.gitmodules index a811e12..8c36aad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "Engine/gd"] path = Engine/gd url = https://github.com/godotengine/godot +[submodule "Engine/gdnative_cpp"] + path = Engine/gdnative_cpp + url = https://github.com/godotengine/godot-cpp diff --git a/Engine/gdnative_cpp b/Engine/gdnative_cpp new file mode 160000 index 0000000..95a2303 --- /dev/null +++ b/Engine/gdnative_cpp @@ -0,0 +1 @@ +Subproject commit 95a2303e37fd28b20c2e53f82e867f5a08e1af53 diff --git a/Source/.sconsign.dblite b/Source/.sconsign.dblite deleted file mode 100644 index 6744373ca07233e035c07fb461db15178b2db00a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4889 zcmd^@yN}#N9LEoIA)CkLbpb&jZ~-XnCcxD^~#iB$aD3KsYq;Ocx<2P#)KUTK) zE{BK|L~BHW(?UZ-Lq$o$e}KdvfGCmZpi9Ge_wKTLkSIE?TWiN2zjnSmpZUG^?()53 zt4ovZPJ5wwb#yVRHZxVEkPnj_qOHTwF)Bq)E&C*PTQPI z6E!SMQNQ6H@-~v(6dRRiK#hkUqn^9lHpi~NQ{#tuWwSzV6O1Cn@yDNowBh?(aN*L{-JO)KDeEs=e7ZN0fmP|OkUpc6x?oQfkO>g_#@edV>yd3`Z5unuW4${?@1{;i}Ql|__Qo0T7pt8z*yno@fI0i|A=L}G2uc~p5K2zC;-S$b#3DeJF>L5Oj355kv5c$VtnP;K*5kOZB-iQK zKs1^Bi9^$=tSYG5{$Pse!v~0tY?N{|0^`LC4T)GvP#`P_WNDyGNVsDr7?H?lzI+6v z@7~@G>Ea$C6(zL&9}i5z&iC#x4LcW_qZ51sqZXVIH%uy_nKK|pxuDVp#%N=mWjVw0 zAHnFk*Jl|uC!j2ga*#<~7S&`@kQL?TKFJUy z2rvf-Lt?pNAx4x2S|DY(HXO~!`1{P9jGh6zPjex#&oGvOH6kQNA|a(U*!m`<8UYGt zM0|T{PQ>vH>bNiimm5tT(*Nh8B}W(pbw3^vhJX>Fv?lJVL^SYcwb(f=hYR%y=z4#+ zxZul>b14vV(AKREMtw}NkB#8mYBM9_ud{P9PIhwv^P@R6EA{3G23<3}xQ{qPQcC7hU4=*&mjnB7PQ5R8bCRw$ca`|C zl-Zhf{|Qu4mUM|!Ve7T^q#Da~t*XZ+DIy>Fe$)l7ah}wh(YlW6qDbBImFr^a5$rw~ zk*<`F;-ac=Ga9+p_WxbhKc&+JFY38V=@1iKIeORxl!5Zyrku^WjE0JNhUadKcK%`c M<=5WQE{bFCAD?;#hyVZp diff --git a/Source/SConstruct b/Source/SConstruct index 31eb96c..c056334 100644 --- a/Source/SConstruct +++ b/Source/SConstruct @@ -18,10 +18,13 @@ opts.Add(PathVariable('target_path', 'The path where the lib is installed.', Pro opts.Add(PathVariable('target_name', 'The library name.', 'libgdexample', PathVariable.PathAccept)) # Local dependency paths, adapt them to your setup -godot_headers_path = ProjPath + "/Engine/gdnative_cpp/godot-headers/" -cpp_bindings_path = ProjPath + "/Engine/gdnative_cpp/" +godot_headers_path = ProjPath + "/Engine/gdnative_cpp/godot_cpp/godot-headers/" +cpp_bindings_path = ProjPath + "/Engine/gdnative_cpp/godot_cpp/" cpp_library = "libgodot-cpp" +GDNative_Src = ProjPath + '/Engine/gdnative_cpp/godot_cpp/src/*.cpp' +Src = ProjPath + "/Source/*.cpp" + # only support 64 at this time.. bits = 64 @@ -100,16 +103,13 @@ env.Append(CPPPATH=['.', godot_headers_path, cpp_bindings_path + 'include/', cpp env.Append(LIBPATH=[cpp_bindings_path + 'bin/']) env.Append(LIBS=[cpp_library]) -GDNative_Src = ProjPath + '/Engine/gdnative_cpp/src/*.cpp' -Src = ProjPath + "/Source/*.cpp" - # tweak this if you want to use different folders, or more folders, to store your source code in. env.Append(CPPPATH=[GDNative_Src]) env.Append(CPPPATH=[Src]) sources = Glob(GDNative_Src, Src) +test = "Sources: ".join(sources) +print(test); - -print(sources); library = env.SharedLibrary(target=env['target_path'] + env['target_name'] , source=sources) Default(library) diff --git a/Source/vc140.idb b/Source/vc140.idb index 5b5d207e733b156ec6e0f58d57b6061abe9cf990..78d3ebd2c07d7f80ef4f0e3ede0dc44fcbe42dac 100644 GIT binary patch delta 149 zcmZpOXo#4gBFM)O diff --git a/Source/vc140.pdb b/Source/vc140.pdb index 387f84b9b597987b591a354d14224cf149f4cf3c..d84f375ff97299fefbc5ffcd92885261b23bfa28 100644 GIT binary patch delta 158 zcmZqZU~TANouDGf$iTqB3B(FO3<4aR6%$VLGd=jXnNi>${~`qe&MA6^j7-03l9(oQ z2AFQPGdRT0$qH1c0K_(vKjsTFGcz!3mUno_Kj{L`WF7|&ZZ?Mh|5<>t|Nk>@W-Ne- j>r6Hi3RR5y%b1~OPTJAQu5&&UR({_`_3Zf0!we;5FQ?Im*n