Merge pull request #1 from Unity-Technologies/fix-linux-build

Fix the linux build for Unity.

Author: KEngelstoft

3rdparty/Perl/lib/SDKDownloader.pm

@@ -113,7 +113,7 @@ sub PrepareSDK
     # Load in the SDK specific perl module
     my $module = "SDK.pm";
     delete($INC{$module});
-    push(@INC, catdir(($dir, $repo_name)));
+    push(@INC, catdir(($cwd, $dir, $repo_name)));
     require $module;
 
     # Obtain default SDK configuration so we can fill out values

RadeonRays/src/accelerator/bvh2.cpp

@@ -35,7 +35,21 @@ namespace RadeonRays
     inline
     void *Align(std::size_t alignment, std::size_t size, std::size_t space, void *ptr)
     {
+#if !defined(__GNUC__) || __GNUC__ >= 5
         return std::align(alignment, size, ptr, space);
+#else
+	// gcc4 doesn't have std::align
+        const auto intptr = reinterpret_cast<uintptr_t>(ptr);
+        const auto aligned = (intptr - 1u + alignment) & -alignment;
+        const auto diff = aligned - intptr;
+        if ((size + diff) > space)
+          return nullptr;
+        else
+        {
+            space -= diff;
+            return ptr = reinterpret_cast<void*>(aligned);
+        }
+#endif
     }
 
 #ifdef __GNUC__

RadeonRays/src/intersector/intersector_2level.cpp

@@ -261,7 +261,7 @@ namespace RadeonRays
             // Create actual BVH objects
             for (int i = 0; i < nummeshes + 1; ++i)
             {
-                m_bvhs[i] = std::make_unique<Bvh>(traversal_cost, num_bins, use_sah);
+                m_bvhs[i] = std::unique_ptr<Bvh>(new Bvh(traversal_cost, num_bins, use_sah));
                 m_cpudata->bvhptrs[i] = m_bvhs[i].get();
             }
 
@@ -589,7 +589,7 @@ namespace RadeonRays
                 use_sah = true;
             }
 
-            m_bvhs[nummeshes] = std::make_unique<Bvh>(traversal_cost, num_bins, use_sah);
+            m_bvhs[nummeshes] = std::unique_ptr<Bvh>(new Bvh(traversal_cost, num_bins, use_sah));
             m_bvhs[nummeshes]->Build(&object_bounds[0], nummeshes + numinstances);
             m_cpudata->bvhptrs[nummeshes] = m_bvhs[nummeshes].get();
 

RadeonRays/src/intersector/intersector_hlbvh.cpp

@@ -148,7 +148,7 @@ namespace RadeonRays
             std::vector<int> mesh_faces_start_idx(numshapes);
 
             //
-            m_bvh = std::make_unique<Hlbvh>(m_device);
+            m_bvh = std::unique_ptr<Hlbvh>(new Hlbvh(m_device));
 
             // Here we now that only Meshes are present, otherwise 2level strategy would have been used
             for (int i = 0; i < numshapes; ++i)

build.pl

@@ -10,10 +10,12 @@
 use Archive::Zip;
 use SDKDownloader;
 
+my $buildCommandPrefix = '';
 sub CheckInstallSDK
 {
     print 'Setting up the Linux SDK';
-    SDKDownloader::PrepareSDK('linux-sdk', '20180907', "artifacts");
+    SDKDownloader::PrepareSDK('linux-sdk', '20180928', "artifacts");
+    $buildCommandPrefix = "schroot -c $ENV{LINUX_BUILD_ENVIRONMENT} --";
 }
 
 my $err; # used by CheckFileError
@@ -25,14 +27,14 @@ sub CheckInstallSDK
 sub BuildRadeonRays
 {
 	my $cmakeString = shift;
-    system($cmakeString) && die("cmake failed");
+    system("$buildCommandPrefix $cmakeString") && die("cmake failed");
 	if ($Config{osname} eq "MSWin32")
 	{
 		system("\"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/devenv.exe\" RadeonRaysSDK.sln /Build RelWithDebInfo");
 	}
 	else
 	{
-		system("make") && die("Failed make");
+		system("$buildCommandPrefix make") && die("Failed make");
 	}
 }