windows makefile

Author: bilam

makemsvc/jamalgam/makefile

@@ -330,7 +330,7 @@ else
  ../openssl-asm/sha512-586-nasm.o
 endif
 
-ifeq (1,$(JAVX512))
+ifeq (j64avx512,$(j64x))
  OBJS_SIMDUTF8= \
  utf/utf8_to_utf16le_avx512.o \
  utf/utf16le_to_utf8_avx512.o
@@ -360,17 +360,6 @@ endif
 %.res : %.rc
 	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $<
 
-# ifeq (arm64,$(TARGET_CPU))
-#  TARGET = jamalgam-arm64.exe
-# else ifeq (x64,$(TARGET_CPU))
-#  ifeq (1,$(JAVX2))
-#   TARGET = jamalgam-avx2.exe
-#  else
-#   TARGET = jamalgam.exe
-#  endif
-# else
-#  TARGET = jamalgam32.exe
-# endif
 TARGET = jamalgam.exe
 
 ifeq (1,$(NOSYNCHLIB))

makemsvc/jamalgam/makefile.win

@@ -328,7 +328,7 @@ OBJS_ASM = \
  ../openssl-asm/sha512-586-nasm.o
 !endif
 
-!if "1"=="$(JAVX512)"
+!if "j64avx512"=="$(j64x)"
 OBJS_SIMDUTF8= \
  utf/utf8_to_utf16le_avx512.o \
  utf/utf16le_to_utf8_avx512.o
@@ -358,17 +358,6 @@ LD = lld-link
 .rc.res:
 	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $<
 
-# !if "arm64"=="$(TARGET_CPU)"
-# TARGET = jamalgam-arm64.exe
-# !elseif "x64"=="$(TARGET_CPU)"
-# !if "1"=="$(JAVX2)"
-# TARGET = jamalgam-avx2.exe
-# !else
-# TARGET = jamalgam.exe
-# !endif
-# !else
-# TARGET = jamalgam32.exe
-# !endif
 TARGET = jamalgam.exe
 
 !if "1"=="$(NOSYNCHLIB)"

makemsvc/jdll/makefile.win

@@ -322,7 +322,7 @@ OBJS_ASM = \
  ../openssl-asm/sha512-586-nasm.o
 !endif
 
-!if "1"=="$(JAVX512)"
+!if "j64avx512"=="$(j64x)"
 OBJS_SIMDUTF8= \
  utf/utf8_to_utf16le_avx512.o \
  utf/utf16le_to_utf8_avx512.o

makemsvc/jnative/makefile

@@ -44,13 +44,6 @@ endif
 %.o : %.c
 	$(CC) $(CFLAGS) /I "$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /Fo$@ /c $<
 
-# ifeq (arm64,$(TARGET_CPU))
-#  TARGET = jnativearm64.dll
-# else ifeq (x64,$(TARGET_CPU))
-#  TARGET = jnative.dll
-# else
-#  TARGET = jnative32.dll
-# endif
 TARGET = jnative.dll
 
 $(ODIR)/$(TARGET) : $(OBJS)

makemsvc/jnative/makefile.win

@@ -44,13 +44,6 @@ LD = lld-link
 .c.o:
 	$(CC) $(CFLAGS) /I "%JAVA_HOME%/include" /I "%JAVA_HOME%/include/win32" /Fo$@ /c $<
 
-# !if "arm64"=="$(TARGET_CPU)"
-# TARGET = jnativearm64.dll
-# !elseif "x64"=="$(TARGET_CPU)"
-# TARGET = jnative.dll
-# !else
-# TARGET = jnative32.dll
-# !endif
 TARGET = jnative.dll
 
 $(ODIR)/$(TARGET) : $(OBJS)

makemsvc/makemsvc.txt

@@ -26,19 +26,17 @@ and then cd to the makemsvc folder
 
 1. build jconsole.exe
 cd jconsole
-nmake -f makefile.win CC=clang-cl x64=1 clean
-nmake -f makefile.win CC=clang-cl x64=1
+nmake -f makefile.win CC=clang-cl j64x=j64 clean
+nmake -f makefile.win CC=clang-cl j64x=j64
 cd ..
 
 2. build j.dll
-same as for jconsole but cd into jdll. add JAVX or JAVX2 and OpenMP flag as needed
+same as for jconsole but cd into jdll. add OpenMP flag as needed
 cd jdll
-nmake -f makefile.win CC=clang-cl x64=1 JAVX2=1 USE_OPENMP=0 USE_PYXES=1 clean
-nmake -f makefile.win CC=clang-cl x64=1 JAVX2=1 USE_OPENMP=0 USE_PYXES=1
-nmake -f makefile.win CC=clang-cl x64=1 JAVX=1 USE_OPENMP=0 c USE_PYXES=1lean
-nmake -f makefile.win CC=clang-cl x64=1 JAVX=1 USE_OPENMP=0 USE_PYXES=1
-nmake -f makefile.win CC=clang-cl x64=1 USE_OPENMP=0 USE_PYXES=1c lean
-nmake -f makefile.win CC=clang-cl x64=1 USE_OPENMP=0 USE_PYXES=1
+nmake -f makefile.win CC=clang-cl j64x=j64avx2 USE_OPENMP=0 USE_PYXES=1 clean
+nmake -f makefile.win CC=clang-cl j64x=j64avx2 USE_OPENMP=0 USE_PYXES=1
+nmake -f makefile.win CC=clang-cl j64x=j64 USE_OPENMP=0 USE_PYXES=1c lean
+nmake -f makefile.win CC=clang-cl j64x=j64 USE_OPENMP=0 USE_PYXES=1
 cd ..
 
 3. build tsdll.dll -  used in test suite to validate cd

makemsvc/tsdll/makefile.win

@@ -44,13 +44,6 @@ LD = lld-link
 .c.o:
 	$(CC) $(CFLAGS) /Fo$@ /c $<
 
-# !if "arm64"=="$(TARGET_CPU)"
-# TARGET = tsdllarm64.dll
-# !elseif "x64"=="$(TARGET_CPU)"
-# TARGET = tsdll.dll
-# !else
-# TARGET = tsdll32.dll
-# !endif
 TARGET = tsdll.dll
 
 $(ODIR)/$(TARGET) : $(OBJS)

script/buildga.cmd

@@ -154,12 +154,12 @@ copy bin\windows\j64avx2\j.dll j64\javx2.dll
 @rem copy bin\windows\j64\jamalgam.exe j64
 GOTO L06C
 :L06A
-copy bin\windows\j32\console.exe j32
+copy bin\windows\j32\jconsole.exe j32
 copy bin\windows\j32\*.dll j32
 @rem copy bin\windows\j32\jamalgam.exe j32
 GOTO L06C
 :L06B
-copy bin\windows\j64arm\console.exe j64
+copy bin\windows\j64arm\jconsole.exe j64
 copy bin\windows\j64arm\*.dll j64
 @rem copy bin\windows\j64arm\jamalgam.exe j64
 :L06C