Build script library cleanup

kecho · Mar 19, 2022 · c6279c9 · c6279c9
1 parent 6380aef
commit c6279c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/Build/Tundra/framework.lua b/Build/Tundra/framework.lua
@@ -68,7 +68,7 @@ function _G.BuildModules(sourceDir, moduleMap, extraIncludes, extraDeps)
     end
 end
 
-function _G.BuildPyLib(libName, libFolder, sourceDir, includeList, moduleList, otherLibs, otherDeps)
+function _G.BuildPyLib(libName, libFolder, sourceDir, includeList, moduleList, otherLibs, otherDeps, otherLibPaths)
     local pythonLib = SharedLibrary {
         Name = libName,
         Pass = "BuildCode",
@@ -87,13 +87,14 @@ function _G.BuildPyLib(libName, libFolder, sourceDir, includeList, moduleList, o
                 Recursive =  true
             },
         },
+        LibPaths = otherLibPaths,
         IdeGenerationHints = _G.GenRootIdeHints("PyModules");
     }
 
     Default(pythonLib)
 end
 
-function _G.BuildProgram(programName, programSource, defines, sourceDir, includeList, moduleList, otherLibs)
+function _G.BuildProgram(programName, programSource, defines, sourceDir, includeList, moduleList, otherLibs, otherLibPaths)
     local prog = Program {
         Name = programName,
         Pass = "BuildCode",
@@ -114,6 +115,7 @@ function _G.BuildProgram(programName, programSource, defines, sourceDir, include
                 Recursive =  true
             },
         },
+        LibPaths = otherLibPaths,
         IdeGenerationHints = _G.GenRootIdeHints("Apps");
     }
 

diff --git a/Build/Tundra/units.lua b/Build/Tundra/units.lua
@@ -22,6 +22,7 @@ local LibIncludes = {
     },
     {
         "/usr/include/python3.9",
+        OpenEXRLibDir,
         Config = "linux-*-*"
     },
     ImguiDir,
@@ -58,10 +59,21 @@ local Libraries = {
     },
     {
         "pthread",
+        ":libHalf.a",
+        ":libIex.a",
+        ":libIexMath.a",
+        ":libIlmImf.a",
+        ":libIlmImfUtil.a",
+        ":libIlmThread.a",
+        ":libImath.a",
         Config = "linux-*-*"
     }
 }
 
+local LibPaths = {
+    OpenEXRLibDir
+}
+
 local Binaries = {
     DxcBinaryCompiler,
     DxcBinaryIl,
@@ -202,8 +214,8 @@ local SrcDLL = "$(OBJECTDIR)$(SEP)gpu.dll"
 local SrcSO = "$(OBJECTDIR)$(SEP)libgpu.so"
 
 _G.BuildModules(SourceDir, CoalPyModuleTable, CoalPyModuleIncludes, CoalPyModuleDeps)
-_G.BuildPyLib("gpu", "pymodules/gpu", SourceDir, LibIncludes, CoalPyModules, Libraries, CoalPyModuleDeps.render)
-_G.BuildProgram("coalpy_tests", "tests", { "CPY_ASSERT_ENABLED=1" }, SourceDir, LibIncludes, CoalPyModules, Libraries)
+_G.BuildPyLib("gpu", "pymodules/gpu", SourceDir, LibIncludes, CoalPyModules, Libraries, CoalPyModuleDeps.render, LibPaths)
+_G.BuildProgram("coalpy_tests", "tests", { "CPY_ASSERT_ENABLED=1" }, SourceDir, LibIncludes, CoalPyModules, Libraries, LibPaths)
 _G.DeployPyPackage("coalpy", "gpu", SrcDLL, SrcSO, Binaries, ScriptsDir)
 
 -- Deploy PIP package

diff --git a/External/OpenEXR/staticlib/libIlmImf.a b/External/OpenEXR/staticlib/libIlmImf.a
diff --git a/External/OpenEXR/staticlib/libIlmImfUtil.a b/External/OpenEXR/staticlib/libIlmImfUtil.a