Fixes for UE5.4 (#84)

Make project compile with UE5.4
JBenda · Apr 24, 2024 · 3f9ec5b · 3f9ec5b
1 parent 31bae5c
commit 3f9ec5b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 35 deletions.
diff --git a/inkcpp/list_impl.cpp b/inkcpp/list_impl.cpp
@@ -13,21 +13,23 @@ namespace ink::runtime::internal
 bool list_impl::contains(const char* flag_name) const
 {
 	auto flag = _list_table->toFlag(flag_name);
-	inkAssert(flag.has_value(), "No flag with name found! '%s'", flag_name);
+	inkAssert(flag.has_value(), "No flag with name found! " FORMAT_STRING_STR "'", flag_name);
 	return _list_table->has(list_table::list{_list}, *flag);
 }
 
 void list_impl::add(const char* flag_name)
 {
 	auto flag = _list_table->toFlag(flag_name);
-	inkAssert(flag.has_value(), "No flag with name found to add! '%s'", flag_name);
+	inkAssert(flag.has_value(), "No flag with name found to add! '" FORMAT_STRING_STR "'", flag_name);
 	_list = _list_table->add(list_table::list{_list}, *flag).lid;
 }
 
 void list_impl::remove(const char* flag_name)
 {
 	auto flag = _list_table->toFlag(flag_name);
-	inkAssert(flag.has_value(), "No flag with name found to remove! '%s'", flag_name);
+	inkAssert(
+	    flag.has_value(), "No flag with name found to remove! '" FORMAT_STRING_STR "'", flag_name
+	);
 	_list = _list_table->sub(list_table::list{_list}, *flag).lid;
 }
 

diff --git a/inkcpp_compiler/CMakeLists.txt b/inkcpp_compiler/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCES
 	list_data.h list_data.cpp
     command.cpp
     )
-add_definitions(-DINK_COMPILER -DINK_EXPOSE_JSON)
+add_definitions(-DINK_EXPOSE_JSON)
 add_library(inkcpp_compiler_o OBJECT ${SOURCES})
 add_library(inkcpp_compiler $<TARGET_OBJECTS:inkcpp_compiler_o>)
 

diff --git a/inkcpp_compiler/binary_emitter.cpp b/inkcpp_compiler/binary_emitter.cpp
@@ -373,7 +373,7 @@ void binary_emitter::process_paths()
 				// Otherwise, write container address
 				if (container == nullptr) {
 					_containers.set(position, 0);
-					inkAssert(optional, "Was not able to resolve a not optional path! '%s'", path.c_str());
+					inkAssert(optional, "Was not able to resolve a not optional path! '%hs'", path.c_str());
 				} else {
 					_containers.set(position, container->offset);
 				}

diff --git a/shared/private/command.h b/shared/private/command.h
@@ -168,7 +168,5 @@ namespace ink
 	template<typename PayloadType>
 	constexpr unsigned int CommandSize = sizeof(Command) + sizeof(CommandFlag) + sizeof(PayloadType);
 
-#ifdef INK_COMPILER
-	extern const char* CommandStrings[];
-#endif
+  extern const char* CommandStrings[];
 }
diff --git a/shared/public/system.h b/shared/public/system.h
@@ -24,6 +24,20 @@
 #	include <cstdarg>
 #endif
 
+// Platform specific defines //
+
+#ifdef INK_ENABLE_UNREAL
+#	define inkZeroMemory(buff, len)        FMemory::Memset(buff, 0, len)
+#	define inkAssert(condition, text, ...) checkf(condition, TEXT(text), ##__VA_ARGS__)
+#	define inkFail(text, ...)              checkf(false, TEXT(text), ##__VA_ARGS__)
+#	define FORMAT_STRING_STR               "%hs"
+#else
+#	define inkZeroMemory     ink::internal::zero_memory
+#	define inkAssert         ink::ink_assert
+#	define inkFail(...)      ink::ink_assert(false, __VA_ARGS__)
+#	define FORMAT_STRING_STR "%s"
+#endif
+
 namespace ink
 {
 /** define basic numeric type
@@ -168,20 +182,6 @@ template<typename... Args>
 	ink_assert(false, msg, args...);
 	exit(EXIT_FAILURE);
 }
-#else
-/** platform indipendent assert(false) with message.
- * @param msg formatting string
- * @param args arguments to format string
- */
-template<typename... Args>
-inline void ink_fail(const char* msg, Args... args)
-{
-	if (sizeof...(args) > 0) {
-		checkf(false, UTF8_TO_TCHAR(msg), args...)
-	} else {
-		checkf(false, UTF8_TO_TCHAR(msg));
-	}
-}
 #endif
 
 namespace runtime::internal
@@ -295,7 +295,7 @@ class optional
 	void test_value() const
 	{
 		if (! _has_value) {
-			ink_fail("Can't access empty optional!");
+			inkFail("Can't access empty optional!");
 		}
 	}
 
@@ -304,15 +304,3 @@ class optional
 };
 #endif
 } // namespace ink
-
-// Platform specific defines //
-
-#ifdef INK_ENABLE_UNREAL
-#	define inkZeroMemory(buff, len)        FMemory::Memset(buff, 0, len)
-#	define inkAssert(condition, text, ...) checkf(condition, TEXT(text), ##__VA_ARGS__)
-#	define inkFail                         ink::ink_fail
-#else
-#	define inkZeroMemory ink::internal::zero_memory
-#	define inkAssert     ink::ink_assert
-#	define inkFail(...)  ink::ink_assert(false, __VA_ARGS__)
-#endif
diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp
@@ -8,6 +8,7 @@
 
 #include "InkList.h"
 #include <string>
+#include "ink/list.h"
 
 bool UInkList::ContainsFlag(const FString& flag_name) const
 {

diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/inklecate_cmd.cpp.in b/unreal/inkcpp/Source/inkcpp_editor/Private/inklecate_cmd.cpp.in
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "Kismet/GameplayStatics.h"
+#include "string"
 
 inline std::string get_inklecate_cmd() {
 	FString platform = UGameplayStatics::GetPlatformName();