Small fixes

heyx3 · Dec 16, 2024 · 8f574d7 · 8f574d7
1 parent aa81b07
commit 8f574d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 21 deletions.
diff --git a/WFC++.vcxproj b/WFC++.vcxproj
@@ -187,14 +187,7 @@ mkdir "$(TargetDir)include"
 
 REM Move headers to "include" directory
 xcopy "$(ProjectDir)WFC++\*.h" "$(TargetDir)include" /sy
-xcopy "$(ProjectDir)WFC++\*.hpp" "$(TargetDir)include" /sy
-
-REM Move relevant Cpp files to Unreal Source directory
-set UNREAL_WFC_DIR=$(SolutionDir)WFCunreal\Source\WfcppRuntime\Private\WFCpp
-xcopy "$(ProjectDir)WFC++\*.cpp" "%UNREAL_WFC_DIR%\" /sy
-del /q "%UNREAL_WFC_DIR%\Simple"
-del /q "%UNREAL_WFC_DIR%\SWIG"
-del /q "%UNREAL_WFC_DIR%\Tiled"</Command>
+xcopy "$(ProjectDir)WFC++\*.hpp" "$(TargetDir)include" /sy</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Copy headers to build folder, and source to Unreal</Message>
@@ -232,14 +225,7 @@ mkdir "$(TargetDir)include"
 
 REM Move headers to "include" directory
 xcopy "$(ProjectDir)WFC++\*.h" "$(TargetDir)include" /sy
-xcopy "$(ProjectDir)WFC++\*.hpp" "$(TargetDir)include" /sy
-
-REM Move relevant Cpp files to Unreal Source directory
-set UNREAL_WFC_DIR=$(SolutionDir)WFCunreal\Source\WfcppRuntime\Private\WFCpp
-xcopy "$(ProjectDir)WFC++\*.cpp" "%UNREAL_WFC_DIR%\" /sy
-del /q "%UNREAL_WFC_DIR%\Simple"
-del /q "%UNREAL_WFC_DIR%\SWIG"
-del /q "%UNREAL_WFC_DIR%\Tiled"</Command>
+xcopy "$(ProjectDir)WFC++\*.hpp" "$(TargetDir)include" /sy</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Copy headers to build folder, and source to Unreal</Message>

diff --git a/WFC++/Tiled3D/Tile.hpp b/WFC++/Tiled3D/Tile.hpp
@@ -30,7 +30,7 @@ namespace WFC
             //    so that there's plenty of room to be given a weight under the default.
             uint32_t Weight = 100;
 
-            WFCPP_MEMORY_CHECK_FOOTER(16, "Tile struct");
+            WFCPP_MEMORY_CHECK_FOOTER(16);
             inline void DEBUGMEM_ValidateAll()
             {
                 DEBUGMEM_Validate();

diff --git a/WFC++/Tiled3D/Transform3D.h b/WFC++/Tiled3D/Transform3D.h
@@ -390,6 +390,8 @@ namespace WFC
                 }
                 return set;
             }
+            #pragma warning( push )
+            #pragma warning( disable: 4499 ) //Warning about use of 'static' below, but that's needed for Unreal 4/C++17
             template<> static TransformSet Combine<TransformSet>(const TransformSet& set) { return set; }
             template<> static TransformSet Combine<Transform3D>(const Transform3D& transf)
             {
@@ -405,6 +407,7 @@ namespace WFC
                 tRest.Add(tFirst);
                 return tRest;
             }
+            #pragma warning( pop )
 
 
             uint_fast8_t Size() const { return nBits; }

diff --git a/WFCunreal/Source/WfcppEditor/WfcppEditor.Build.cs b/WFCunreal/Source/WfcppEditor/WfcppEditor.Build.cs
@@ -9,8 +9,7 @@ public WfcppEditor(ReadOnlyTargetRules target) : base(target)
 		PublicDependencyModuleNames.AddRange(new [] {
 			"Core", "CoreUObject",
 			"Engine", "InputCore",
-			"UnrealEd",
-			"WfcppRuntime"
+			"UnrealEd", "WfcppRuntime"
 		});
 		PrivateDependencyModuleNames.AddRange(new string[] {
 			"Json", "Slate", "SlateCore", "EditorStyle", "EditorWidgets",

diff --git a/WFCunreal/Source/WfcppRuntime/WfcppRuntime.Build.cs b/WFCunreal/Source/WfcppRuntime/WfcppRuntime.Build.cs
@@ -10,10 +10,9 @@ public WfcppRuntime(ReadOnlyTargetRules target) : base(target)
 		CppStandard = CppStandardVersion.Cpp17;
 
 		PublicDependencyModuleNames.AddRange(new string[] {
+			"Core", "CoreUObject", "Engine"
 		});
 		PrivateDependencyModuleNames.AddRange(new string[] {
-			"Core", "CoreUObject",
-			"Engine", "InputCore"
 		});
 
 		//Compile the WFC cpp files as part of this module.