compiling on macos

Author: janm31415

sf/CMakeLists.txt

@@ -98,13 +98,13 @@ set(XLIBINCLUDE "/usr/X11/include/")
 set(XLIBLIBRARY "/usr/X11/lib/libX11.dylib")
 endif (APPLE)
 
-target_link_libraries(sf
-    PRIVATE
-    asm
-    vectorforth
-    ${TBB_LIBRARIES}    
-    ${XLIBINCLUDE}
-    )
+target_include_directories(sf
+   PRIVATE
+   ${CMAKE_CURRENT_SOURCE_DIR}/../
+   ${CMAKE_CURRENT_SOURCE_DIR}/../jtk/
+   ${XLIBINCLUDE}
+   ${TBB_INCLUDE_DIR}
+   )
 
 target_link_libraries(sf
     PRIVATE
@@ -113,4 +113,4 @@ target_link_libraries(sf
     ${XLIBLIBRARY}
     ${TBB_LIBRARIES}    
     )
-endif (UNIX)
+endif (UNIX)

shaderforth/image.h

@@ -4,6 +4,7 @@
 #include <emmintrin.h>
 #include <stdint.h>
 #include <memory>
+#include <cmath>
 
 template <class T>
 class image
@@ -309,4 +310,4 @@ void draw_line(T* raw, double x1, double y1, double x2, double y2, const uint32_
       error += dx;
       }
     }
-  }
+  }

vectorforth.tests/compile_tests.cpp

@@ -110,12 +110,21 @@ namespace
     return *reinterpret_cast<int32_t*>(&f);
     }
 
+  union cvt256_to_64
+  {
+      __m256 v;
+      uint64_t u[4];
+  };
+  
   inline uint64_t get_avx2_u64(__m256 v, int i)
     {
 #ifdef _WIN32    
     return *reinterpret_cast<uint64_t*>(&v.m256_f32[i]);
-#else
+#elif defined(unix)
     return *reinterpret_cast<uint64_t*>(&v[i]);
+#else
+        cvt256_to_64 c = {v};
+        return c.u[i];
 #endif
     }
 
@@ -2922,4 +2931,4 @@ void run_all_compile_tests()
   run_compile_tests(c_ops);
   avx_mathfun_test();
   avx_mathfun_test_2();
-  }
+  }

vectorforth.tests/test_assert.h

@@ -2,6 +2,7 @@
 
 #include <sstream>
 #include <string>
+#include <cmath>
 
 #define TEST_OUTPUT_LINE(...) \
       { printf(__VA_ARGS__); printf("\n"); }
@@ -69,4 +70,4 @@ void TestEqClose(T expval, U val, V tol, const char *file, int line, const char
     }
   else
     ++testing_success;
-  }
+  }