Skip to content

Commit

Permalink
new version
Browse files Browse the repository at this point in the history
  • Loading branch information
DmitriySalnikov committed Sep 11, 2024
1 parent 838bb01 commit 32f9bf1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def apply_patches(target, source, env: SConsEnvironment):
def get_android_toolchain() -> str:
sys.path.insert(0, "godot-cpp/tools")
import android

sys.path.pop(0)
return os.path.join(android.get_android_ndk_root(env), "build/cmake/android.toolchain.cmake")

Expand Down
2 changes: 1 addition & 1 deletion lib_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


def get_sources(src: list, src_folder: str, lib_name: str = "unity_"):
res = [src_folder + "/" + file for file in src]
res = [os.path.join(src_folder, file) for file in src]
res = unity_tools.generate_unity_build(res, lib_name + "_")
return res

Expand Down
2 changes: 1 addition & 1 deletion lib_utils_external.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def cmake_build_project(env: SConsEnvironment, lib_path: str, extra_args: list,
linker_flags = extra_c_compiler_flags.get("linker_flags", []).copy()

if platform == "windows":
arch_map = { "arm32": "ARM", "arm64": "ARM64", "x86_32": "Win32", "x86_64":"x64" }
arch_map = { "arm32": "ARM", "arm64": "ARM64", "x86_32": "Win32", "x86_64":"x64" }
platform_args += ["-G", "Visual Studio 17 2022",
"-A", arch_map[arch],
"-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded" + ("" if env["use_static_cpp"] else "DLL")]
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define DD3D_MAJOR 1
#define DD3D_MINOR 4
#define DD3D_PATCH 4
#define DD3D_PATCH 5
#define DD3D_VERSION ((DD3D_MAJOR << (8 * 3)) + (DD3D_MINOR << (8 * 2)) + (DD3D_PATCH << (8 * 1)))

#define _DD3D_VERSION_STR_TEXT(text) #text
Expand Down

0 comments on commit 32f9bf1

Please sign in to comment.