Python - fixes for Linux

Author: RichardGe

python/CMakeLists.txt

@@ -19,16 +19,42 @@ include_directories(
   ../RadeonProRender/inc
 )
 
+
+
+if (WIN32)
+message("link_directories for WIN32")
 link_directories(
   ../RadeonProRender/libWin64
 )
+endif (WIN32)
+
+if (LINUX)
+message("link_directories for LINUX")
+link_directories(
+  ../RadeonProRender/binUbuntu20
+)
+endif (LINUX)
+
 
 
 nanobind_add_module(rpr bind_rpr.cpp bind_common.cpp bind_common.h)
 nanobind_add_module(rprs bind_rprs.cpp bind_common.cpp bind_common.h)
 nanobind_add_module(rprgltf bind_rprgltf.cpp bind_common.cpp bind_common.h)
 
+
+if (WIN32)
 target_link_libraries(rpr PUBLIC RadeonProRender64.lib)
 target_link_libraries(rprs PUBLIC RprLoadStore64.lib)
 target_link_libraries(rprgltf PUBLIC ProRenderGLTF.lib)
+endif (WIN32)
+
+
+if (LINUX)
+target_link_libraries(rpr PUBLIC RadeonProRender64)
+target_link_libraries(rprs PUBLIC RprLoadStore64)
+target_link_libraries(rprgltf PUBLIC ProRenderGLTF)
+endif (LINUX)
+
+
+
 

python/bind_rpr.cpp

@@ -75,7 +75,7 @@ enum class CreationFlags : rpr_creation_flags {
 	ENABLE_GPU15 = (1 << 18) ,
 	ENABLE_HIP = (1 << 19) ,
 	ENABLE_OPENCL = (1 << 20) ,
-	ENABLE_DEBUG = (1 << 31) ,
+	ENABLE_DEBUG = (uint32_t)(1 << 31) ,
 };
 enum class FilterType : rpr_aa_filter {
 	NONE = 0x0 ,

python/test/test_script_gltf.py

@@ -9,12 +9,25 @@
 import sys
 import os
 
+binFolder = ""
+if sys.platform == "linux":
+    binFolder = "binUbuntu20"
+elif sys.platform == "win32":
+    binFolder = "binWin64"
+else:
+    binFolder = "binMacOS"
+
+
 # add the RPR Python library folder in order to import the rpr,rprs,rprgltf modules.
-sys.path.insert(1, '../../python/build/Release')
+if sys.platform == "win32":
+    sys.path.insert(1, '../../python/build/Release')
+
 
 # we need to add the RPR DLLs
-os.add_dll_directory(  os.path.abspath(os.path.dirname(__file__) + '../../../RadeonProRender/binWin64')    )
+if sys.platform == "win32":
+    os.add_dll_directory(  os.path.abspath(os.path.dirname(__file__) + '../../../RadeonProRender/' + binFolder )    )
 
+	
 import rpr
 import rprs
 import rprgltf
@@ -35,7 +48,7 @@ def RPRCHECK(retCode):
 
 
 
-plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/binWin64/Northstar64.dll")))
+plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/" + binFolder + "/Northstar64.dll")))
 if ( plugin_id == -1 ):
     print(f"RPR ERROR: plugin not found.")
     exit()

python/test/test_script_rpr.py

@@ -9,12 +9,25 @@
 import sys
 import os
 
+binFolder = ""
+if sys.platform == "linux":
+    binFolder = "binUbuntu20"
+elif sys.platform == "win32":
+    binFolder = "binWin64"
+else:
+    binFolder = "binMacOS"
+
+
 # add the RPR Python library folder in order to import the rpr,rprs,rprgltf modules.
-sys.path.insert(1, '../../python/build/Release')
+if sys.platform == "win32":
+    sys.path.insert(1, '../../python/build/Release')
+
 
 # we need to add the RPR DLLs
-os.add_dll_directory(  os.path.abspath(os.path.dirname(__file__) + '../../../RadeonProRender/binWin64')    )
+if sys.platform == "win32":
+    os.add_dll_directory(  os.path.abspath(os.path.dirname(__file__) + '../../../RadeonProRender/' + binFolder )    )
 
+	
 import rpr
 import rprs
 import ctypes
@@ -34,7 +47,7 @@ def RPRCHECK(retCode):
 
 
 
-plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/binWin64/Northstar64.dll")))
+plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/"+binFolder+"/Northstar64.dll")))
 if ( plugin_id == -1 ):
     print(f"RPR ERROR: plugin not found.")
     exit()