Merge pull request #45 from GPUOpen-LibrariesAndSDKs/demo_build_fix

RichardGe · web-flow · commit 31a6b57c7157 · 2022-04-04T17:17:20.000+02:00
Demos - fix build
diff --git a/RadeonProRender/binCentOS7/libProRenderGLTF.so b/RadeonProRender/binCentOS7/libProRenderGLTF.so
diff --git a/readme.md b/readme.md
@@ -20,7 +20,7 @@ On Visual Studio:
 then open tutorials/Tutorials.sln
 ```
 
-On Linux:  
+On Ubuntu 18:  
 Dependencies on Linux for the tutorials: GLEW, GLUT, Pthread.
 ```
 > cd tutorials
@@ -29,6 +29,17 @@ Dependencies on Linux for the tutorials: GLEW, GLUT, Pthread.
 > make -j config=release_x64
 ```
 
+On Centos 7:  
+Same dependencies than Ubuntu.  
+You should also update your GCC, we have tested it with devtoolset-10 (yum install devtoolset-10)
+```
+> cd tutorials
+> sudo chmod +x ../premake5/linux64/premake5
+> ../premake5/linux64/premake5 --centos gmake
+> source scl_source enable devtoolset-10
+> make -j config=release_x64
+```
+
 On MacOS:
 ```
 > cd tutorials
diff --git a/tutorials/00_context_creation/premake4.lua b/tutorials/00_context_creation/premake4.lua
@@ -9,10 +9,13 @@ project "00_context_creation"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/03_parameters_enumeration/main.cpp b/tutorials/03_parameters_enumeration/main.cpp
@@ -63,7 +63,7 @@ int main()
 			rpr_parameter_type type;
 			CHECK( rprContextGetParameterInfo(context, int(i), RPR_PARAMETER_TYPE, sizeof(type), &type, NULL));
 
-			uint64_t value_length = 0;
+			size_t value_length = 0;
 			CHECK( rprContextGetParameterInfo(context, int(i), RPR_PARAMETER_VALUE, 0, NULL, &value_length) );
 			char* paramValue = nullptr;
 			if (value_length > 0)
@@ -165,7 +165,7 @@ int main()
 			rpr_uint nodeInputType = 0;
 			CHECK(  rprMaterialNodeGetInputInfo(microfacet, i, RPR_MATERIAL_NODE_INPUT_TYPE, sizeof(nodeInputType), &nodeInputType, NULL) );
 
-			uint64_t inputValueSizeB = 0;
+			size_t inputValueSizeB = 0;
 			CHECK(  rprMaterialNodeGetInputInfo(microfacet, i, RPR_MATERIAL_NODE_INPUT_VALUE, 0, NULL, &inputValueSizeB));
 			char* materialParameterValue = new char[inputValueSizeB];
 			CHECK(  rprMaterialNodeGetInputInfo(microfacet, i, RPR_MATERIAL_NODE_INPUT_VALUE, inputValueSizeB, materialParameterValue, NULL));
diff --git a/tutorials/03_parameters_enumeration/premake4.lua b/tutorials/03_parameters_enumeration/premake4.lua
@@ -14,10 +14,14 @@ project "03_parameters_enumeration"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/05_basic_scene/premake4.lua b/tutorials/05_basic_scene/premake4.lua
@@ -9,10 +9,14 @@ project "05_basic_scene"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/12_transform_motion_blur/premake4.lua b/tutorials/12_transform_motion_blur/premake4.lua
@@ -10,10 +10,14 @@ project "12_transform_motion_blur"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/13_deformation_motion_blur/premake4.lua b/tutorials/13_deformation_motion_blur/premake4.lua
@@ -10,10 +10,14 @@ project "13_deformation_motion_blur"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/17_camera_dof/premake4.lua b/tutorials/17_camera_dof/premake4.lua
@@ -10,10 +10,14 @@ project "17_camera_dof"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/21_material/premake4.lua b/tutorials/21_material/premake4.lua
@@ -10,10 +10,14 @@ project "21_material"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/22_material_uber/premake4.lua b/tutorials/22_material_uber/premake4.lua
@@ -10,10 +10,14 @@ project "22_material_uber"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64" }
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/23_twosided/premake4.lua b/tutorials/23_twosided/premake4.lua
@@ -9,10 +9,14 @@ project "23_twosided"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/24_contour/premake4.lua b/tutorials/24_contour/premake4.lua
@@ -10,10 +10,14 @@ project "24_contour"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/25_toon/premake4.lua b/tutorials/25_toon/premake4.lua
@@ -10,10 +10,14 @@ project "25_toon"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/26_materialx/premake4.lua b/tutorials/26_materialx/premake4.lua
@@ -10,10 +10,14 @@ project "26_materialx"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/27_cutplanes/premake4.lua b/tutorials/27_cutplanes/premake4.lua
@@ -10,10 +10,14 @@ project "27_cutplanes"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/30_tiled_render/premake4.lua b/tutorials/30_tiled_render/premake4.lua
@@ -10,12 +10,16 @@ project "30_tiled_render"
 
     includedirs{ "../../RadeonProRender/inc" } 
 
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
     configuration {"x64"}
     links {"RadeonProRender64"}
     links {"RprLoadStore64"}
 
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
+
     configuration {"x64", "Debug"}
         targetdir "../Bin"
     configuration {"x64", "Release"}
diff --git a/tutorials/31_framebuffer_access/premake4.lua b/tutorials/31_framebuffer_access/premake4.lua
@@ -10,10 +10,14 @@ project "31_framebuffer_access"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/32_gl_interop/premake4.lua b/tutorials/32_gl_interop/premake4.lua
@@ -17,7 +17,7 @@ project "32_gl_interop"
     	includedirs{ "../../3rdParty/glew/include"} 	
 	end
 	
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 
diff --git a/tutorials/33_aov/premake4.lua b/tutorials/33_aov/premake4.lua
@@ -10,10 +10,14 @@ project "33_aov"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/50_curve/premake4.lua b/tutorials/50_curve/premake4.lua
@@ -10,10 +10,14 @@ project "50_curve"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/51_volume/premake4.lua b/tutorials/51_volume/premake4.lua
@@ -10,10 +10,14 @@ project "51_volume"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64"}
+
+    if os.istarget("linux") then
+	    links {"pthread"}
+    end
 	
     configuration {"x64", "Debug"}
         targetdir "../Bin"
diff --git a/tutorials/60_mesh_export/premake4.lua b/tutorials/60_mesh_export/premake4.lua
@@ -10,15 +10,19 @@ project "60_mesh_export"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
     configuration {"x64"}
     links {"RadeonProRender64", "RprLoadStore64", "ProRenderGLTF"}
 
     if os.istarget("linux") then
         linkoptions "-fopenmp"
+		links {"pthread"}
     end
 
+
+
+
     configuration {"x64", "Debug"}
         targetdir "../Bin"
     configuration {"x64", "Release"}
diff --git a/tutorials/61_mesh_import/premake4.lua b/tutorials/61_mesh_import/premake4.lua
@@ -10,13 +10,14 @@ project "61_mesh_import"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
     configuration {"x64"}
     links {"RadeonProRender64", "RprLoadStore64", "ProRenderGLTF"}
 
     if os.istarget("linux") then
         linkoptions "-fopenmp"
+		links {"pthread"}
     end
 
     configuration {"x64", "Debug"}
diff --git a/tutorials/63_hybrid/premake4.lua b/tutorials/63_hybrid/premake4.lua
@@ -10,11 +10,16 @@ project "63_hybrid"
 
     includedirs{ "../../RadeonProRender/inc" } 
     
-    buildoptions "-std=c++11"
+    buildoptions "-std=c++14"
 
 	configuration {"x64"}
 	links {"RadeonProRender64", "RprLoadStore64"}
 	
+
+    if os.istarget("linux") then
+		links {"pthread"}
+    end
+
     configuration {"x64", "Debug"}
         targetdir "../Bin"
     configuration {"x64", "Release"}
diff --git a/tutorials/64_mesh_obj_demo/premake4.lua b/tutorials/64_mesh_obj_demo/premake4.lua
diff --git a/tutorials/premake5.lua b/tutorials/premake5.lua
