jtk update

Author: janm31415

CMakeLists.txt

@@ -9,10 +9,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(JTK_THREADING "tbb" CACHE STRING  "Choose your threading library: tbb is Intel's Threading Building Blocks library, ppl is Windows' concurrency library, std uses std::thread, and none does not use threading.")
- 
-set_property(CACHE JTK_THREADING PROPERTY STRINGS tbb ppl std none)
-
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(AVX512 OFF CACHE BOOL "Set ON for AVX-512, set OFF for AVX2.")

asm/asmcode.h

@@ -8,6 +8,8 @@
 #include "namespace.h"
 #include "asm_api.h"
 
+#undef FSCALE
+
 ASM_BEGIN
 
 class asmcode

jtk

@@ -11,8 +11,8 @@ if (UNIX)
 endif (UNIX)
 
 if (APPLE)
-  set(TBB_INCLUDE_DIR "")
-  set(TBB_LIBRARIES "")
+  set(TBB_INCLUDE_DIR "/usr/local/include" "/usr/include")
+  set(TBB_LIBRARIES "/usr/local/lib/libtbb.dylib")
   set(OPENGL_LIBRARIES "/System/Library/Frameworks/OpenGL.framework/OpenGL")
 endif (APPLE)
 
@@ -56,17 +56,7 @@ if (${SINCOS_METHOD} STREQUAL "approximate")
 add_definitions(-DSINCOSAPPROX)
 endif (${SINCOS_METHOD} STREQUAL "approximate")
 
-if (${JTK_THREADING} STREQUAL "tbb")
-add_definitions(-D_ENABLE_TBB)
-endif (${JTK_THREADING} STREQUAL "tbb")
-
-if (${JTK_THREADING} STREQUAL "ppl")
-add_definitions(-D_ENABLE_PPL)
-endif (${JTK_THREADING} STREQUAL "ppl")
-
-if (${JTK_THREADING} STREQUAL "std")
-add_definitions(-D_ENABLE_THREADS)
-endif (${JTK_THREADING} STREQUAL "std")
+include ("../jtk/jtk/jtk.cmake")
 
 add_executable(sf ${HDRS} ${SRCS})
 source_group("Header Files" FILES ${hdrs})

sf/CMakeLists.txt

@@ -17,8 +17,8 @@ endif (UNIX)
 if (APPLE)
   set(SDL_INCLUDE_DIR "/Library/Frameworks/SDL2.framework/Headers/")
   set(SDL_LIBRARIES "/Library/Frameworks/SDL2.framework/SDL2")
-  set(TBB_INCLUDE_DIR "")
-  set(TBB_LIBRARIES "")
+  set(TBB_INCLUDE_DIR "/usr/local/include" "/usr/include")
+  set(TBB_LIBRARIES "/usr/local/lib/libtbb.dylib")
   set(OPENGL_LIBRARIES "/System/Library/Frameworks/OpenGL.framework/OpenGL")
 endif (APPLE)
 
@@ -92,17 +92,7 @@ if (${SINCOS_METHOD} STREQUAL "approximate")
 add_definitions(-DSINCOSAPPROX)
 endif (${SINCOS_METHOD} STREQUAL "approximate")
 
-if (${JTK_THREADING} STREQUAL "tbb")
-add_definitions(-D_ENABLE_TBB)
-endif (${JTK_THREADING} STREQUAL "tbb")
-
-if (${JTK_THREADING} STREQUAL "ppl")
-add_definitions(-D_ENABLE_PPL)
-endif (${JTK_THREADING} STREQUAL "ppl")
-
-if (${JTK_THREADING} STREQUAL "std")
-add_definitions(-D_ENABLE_THREADS)
-endif (${JTK_THREADING} STREQUAL "std")
+include ("../jtk/jtk/jtk.cmake")
 
 if (WIN32)
 add_executable(shaderforth WIN32 ${HDRS} ${SRCS} ${IMGUI} ${JSON})
@@ -134,4 +124,4 @@ target_link_libraries(shaderforth
     ${SDL_LIBRARIES}
     ${TBB_LIBRARIES}    
     vectorforth
-    )	
+    )