Merge pull request #1947 from mwestphal/release_with_formatting

merge release into master with formatting
f3d-app · Jan 24, 2025 · ddc9f1c · ddc9f1c
2 parents 7db7445 + fa87e2f
commit ddc9f1c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/application/F3DColorMapTools.cxx b/application/F3DColorMapTools.cxx
@@ -30,7 +30,7 @@ fs::path Find(const std::string& str)
 #ifdef __APPLE__
       "/usr/local/etc/f3d/colormaps",
 #endif
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
       "/etc/f3d/colormaps", "/usr/share/f3d/colormaps",
 #endif
       F3DSystemTools::GetBinaryResourceDirectory() / "colormaps" };

diff --git a/application/F3DConfigFileTools.cxx b/application/F3DConfigFileTools.cxx
@@ -30,7 +30,7 @@ std::vector<fs::path> GetConfigPaths(const std::string& configSearch)
 #ifdef __APPLE__
     "/usr/local/etc/f3d",
 #endif
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
     "/etc/f3d",
     "/usr/share/f3d/configs",
 #endif

diff --git a/library/src/context.cxx b/library/src/context.cxx
@@ -100,7 +100,7 @@ context::function context::egl()
 //----------------------------------------------------------------------------
 context::function context::osmesa()
 {
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
   return getSymbol("OSMesa", "OSMesaGetProcAddress");
 #elif _WIN32
   return getSymbol("osmesa", "OSMesaGetProcAddress");

diff --git a/library/src/window_impl.cxx b/library/src/window_impl.cxx
@@ -66,7 +66,7 @@ class window_impl::internals
     // Override VTK logic
 #ifdef _WIN32
     return vtkSmartPointer<vtkF3DWGLRenderWindow>::New();
-#elif __linux__
+#elif defined(__linux__) || defined(__FreeBSD__)
 #if defined(VTK_USE_X)
     // try GLX
     vtkSmartPointer<vtkRenderWindow> glxRenWin = vtkSmartPointer<vtkF3DGLXRenderWindow>::New();

diff --git a/library/testing/TestSDKEngineExceptions.cxx b/library/testing/TestSDKEngineExceptions.cxx
@@ -32,7 +32,7 @@ int TestSDKEngineExceptions(int argc, char* argv[])
     test("engine assignment operator", eng.getWindow().isOffscreen() == false);
   }
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
   // Test incorrect engine configuration
   test.expect<f3d::context::loading_exception>(
     "create WGL engine on linux", [&]() { std::ignore = f3d::engine::createWGL(); });
@@ -59,7 +59,7 @@ int TestSDKEngineExceptions(int argc, char* argv[])
   test.expect<f3d::engine::plugin_exception>("load plugin with invalid long name",
     [&]() { f3d::engine::loadPlugin("/" + std::string(257, 'x') + "/file.ext"); });
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
   // Test error handling without "HOME" set
   unsetenv("HOME");
   test.expect<f3d::engine::cache_exception>(