diff options
| -rw-r--r-- | SConstruct | 13 | ||||
| -rw-r--r-- | lib/godot-cpp/debug/x64/.gitignore (renamed from lib/godot-cpp/debug/.gitignore) | 0 | ||||
| -rw-r--r-- | lib/godot-cpp/debug/x86/.gitignore (renamed from lib/godot-cpp/release/.gitignore) | 0 | ||||
| -rw-r--r-- | lib/godot-cpp/release/x64/.gitignore | 2 | ||||
| -rw-r--r-- | lib/godot-cpp/release/x86/.gitignore | 2 |
5 files changed, 16 insertions, 1 deletions
@@ -9,6 +9,13 @@ def add_sources(sources, dirpath, extension): sources.append(dirpath + '/' + f) +def get_arch_dir(name): + if name == '32': + return 'x86' + elif name == '64': + return 'x64' + return name + env = Environment() customs = ['custom.py'] opts = Variables(customs, ARGUMENTS) @@ -107,7 +114,7 @@ else: # Godot CPP bindings env.Append(CPPPATH=[godot_headers]) env.Append(CPPPATH=[godot_cpp_headers, godot_cpp_headers + '/core', godot_cpp_headers + '/gen']) -env.Append(LIBPATH=[godot_cpp_lib_dir + '/' + target]) +env.Append(LIBPATH=[godot_cpp_lib_dir + '/' + target + '/' + get_arch_dir(target_arch)]) env.Append(LIBS=['godot-cpp']) # WebRTC stuff @@ -156,6 +163,10 @@ sources = [] add_sources(sources, 'src/', 'cpp') add_sources(sources, 'src/net/', 'cpp') +# Suffix +suffix = '.%s.%s' % (target, target_arch) +env["SHOBJSUFFIX"] = suffix + env["SHOBJSUFFIX"] + # Make the shared library library = env.SharedLibrary(target=os.path.join(result_path, result_name), source=sources) Default(library) diff --git a/lib/godot-cpp/debug/.gitignore b/lib/godot-cpp/debug/x64/.gitignore index d6b7ef3..d6b7ef3 100644 --- a/lib/godot-cpp/debug/.gitignore +++ b/lib/godot-cpp/debug/x64/.gitignore diff --git a/lib/godot-cpp/release/.gitignore b/lib/godot-cpp/debug/x86/.gitignore index d6b7ef3..d6b7ef3 100644 --- a/lib/godot-cpp/release/.gitignore +++ b/lib/godot-cpp/debug/x86/.gitignore diff --git a/lib/godot-cpp/release/x64/.gitignore b/lib/godot-cpp/release/x64/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/lib/godot-cpp/release/x64/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/lib/godot-cpp/release/x86/.gitignore b/lib/godot-cpp/release/x86/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/lib/godot-cpp/release/x86/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore |