windows openmp

Author: bilam

make2/build_jamalgam.sh

@@ -136,6 +136,18 @@ if [ $USE_OPENMP -eq 1 ]; then
    OPENMP=" -Xpreprocessor -fopenmp -I/usr/local/include "
    LDOPENMP=" -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lomp "
    ;;
+  windows/j32*)
+   OPENMP=" -fopenmp "
+   LDOPENMP = ../openmp/obj/windows/x86/libomp.lib
+   ;;
+  windows/j64arm)
+   OPENMP=" -fopenmp "
+   LDOPENMP = ../openmp/obj/windows/arm64/libomp.lib
+   ;;
+  windows/*)
+   OPENMP=" -fopenmp "
+   LDOPENMP = ../openmp/obj/windows/x64/libomp.lib
+   ;;
   *)
    OPENMP=" -fopenmp "
    LDOPENMP=" -fopenmp "

make2/build_libj.sh

@@ -136,6 +136,18 @@ if [ $USE_OPENMP -eq 1 ]; then
    OPENMP=" -Xpreprocessor -fopenmp -I/usr/local/include "
    LDOPENMP=" -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lomp "
    ;;
+  windows/j32*)
+   OPENMP=" -fopenmp "
+   LDOPENMP = ../openmp/obj/windows/x86/libomp.lib
+   ;;
+  windows/j64arm)
+   OPENMP=" -fopenmp "
+   LDOPENMP = ../openmp/obj/windows/arm64/libomp.lib
+   ;;
+  windows/*)
+   OPENMP=" -fopenmp "
+   LDOPENMP = ../openmp/obj/windows/x64/libomp.lib
+   ;;
   *)
    OPENMP=" -fopenmp "
    LDOPENMP=" -fopenmp "

makemsvc/jamalgam/makefile

@@ -49,11 +49,11 @@ ifeq (1,$(USE_OPENMP))
  COPTION := $(COPTION) -Xclang -fopenmp
 # LOPENMP = libomp.lib
  ifeq (arm64,$(TARGET_CPU))
-  LOPENMP = ../openmp/obj/windows/libomparm64.lib
+  LOPENMP = ../openmp/obj/windows/arm64/libomp.lib
  else ifeq (x64,$(TARGET_CPU))
-  LOPENMP = ../openmp/obj/windows/libomp.lib
+  LOPENMP = ../openmp/obj/windows/x64/libomp.lib
  else
-  LOPENMP = ../openmp/obj/windows/libomp32.lib
+  LOPENMP = ../openmp/obj/windows/x86/libomp.lib
  endif
 endif
 ifeq (1,$(USE_PYXES))

makemsvc/jamalgam/makefile.win

@@ -56,11 +56,11 @@ COPTION = $(COPTION) /DNORMAH8=0
 COPTION = $(COPTION) -Xclang -fopenmp
 # LOPENMP = libomp.lib
 !if "arm64"=="$(TARGET_CPU)"
-LOPENMP = ../openmp/obj/windows/libomparm64.lib
+LOPENMP = ../openmp/obj/windows/arm64/libomp.lib
 !elseif "x64"=="$(TARGET_CPU)"
-LOPENMP = ../openmp/obj/windows/libomp.lib
+LOPENMP = ../openmp/obj/windows/x64/libomp.lib
 !else
-LOPENMP = ../openmp/obj/windows/libomp32.lib
+LOPENMP = ../openmp/obj/windows/x86/libomp.lib
 !endif
 !endif
 !if "arm64"=="$(TARGET_CPU)"

makemsvc/jdll/makefile

@@ -51,13 +51,12 @@ endif
 
 ifeq (1,$(USE_OPENMP))
  COPTION := $(COPTION) -Xclang -fopenmp
-# LOPENMP = libomp.lib
  ifeq (arm64,$(TARGET_CPU))
-  LOPENMP = ../openmp/obj/windows/libomparm64.lib
+  LOPENMP = ../openmp/obj/windows/arm64/libomp.lib
  else ifeq (x64,$(TARGET_CPU))
-  LOPENMP = ../openmp/obj/windows/libomp.lib
+  LOPENMP = ../openmp/obj/windows/x64/libomp.lib
  else
-  LOPENMP = ../openmp/obj/windows/libomp32.lib
+  LOPENMP = ../openmp/obj/windows/x86/libomp.lib
  endif
 endif
 

makemsvc/jdll/makefile.win

@@ -53,11 +53,11 @@ COPTION = $(COPTION) /DNORMAH8=0
 COPTION = $(COPTION) -Xclang -fopenmp
 # LOPENMP = libomp.lib
 !if "arm64"=="$(TARGET_CPU)"
-LOPENMP = ../openmp/obj/windows/libomparm64.lib
+LOPENMP = ../openmp/obj/windows/arm64/libomp.lib
 !elseif "x64"=="$(TARGET_CPU)"
-LOPENMP = ../openmp/obj/windows/libomp.lib
+LOPENMP = ../openmp/obj/windows/x64/libomp.lib
 !else
-LOPENMP = ../openmp/obj/windows/libomp32.lib
+LOPENMP = ../openmp/obj/windows/x86/libomp.lib
 !endif
 !endif
 !if "arm64"=="$(TARGET_CPU)"