Merge pull request #61 from Forceflow/develop

Reverted changes to fix Ninja build errors
Forceflow · Feb 6, 2021 · 24b63e3 · 24b63e3
2 parents 047813b + ad6af6b
commit 24b63e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/test/libmorton_test.h b/test/libmorton_test.h
@@ -21,8 +21,8 @@
 #include "morton_LUT_generators.h"
 
 // Load libraries we're going to test
-#include <morton2D.h>
-#include <morton3D.h>
+#include <libmorton/morton2D.h>
+#include <libmorton/morton3D.h>
 #if defined(__BMI2__) || (defined(__AVX2__) && defined(_MSC_VER))
 #include <libmorton/morton_BMI.h>
 #endif
@@ -31,7 +31,7 @@
 #endif
 
 // Load main morton include file (should be unnecessary)
-#include <morton.h>
+#include <libmorton/morton.h>
 
 using std::string;
 

diff --git a/test/morton_LUT_generators.h b/test/morton_LUT_generators.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <morton2D.h>
-#include <morton3D.h>
+#include <libmorton/morton2D.h>
+#include <libmorton/morton3D.h>
 
 #include <iostream>
 

diff --git a/test/msvc2019/libmorton_test.vcxproj b/test/msvc2019/libmorton_test.vcxproj
@@ -68,16 +68,16 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\..\..\libmorton;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\..\..\libmorton;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\..\libmorton;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\..\libmorton;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\..\..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>