makemsvc clean up

codereport · Jan 29, 2020 · ed3d184 · ed3d184
1 parent 74e5737
commit ed3d184
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 118 deletions.
diff --git a/makemsvc/install.bat b/makemsvc/install.bat
@@ -9,4 +9,3 @@ mkdir jbld\j64
 
 xcopy /E /Y /Q %1%\jsource\jlibrary jbld\j32\
 xcopy /E /Y /Q %1%\jsource\jlibrary jbld\j64\
-
diff --git a/makemsvc/jconsole/makefile b/makemsvc/jconsole/makefile
@@ -1,24 +1,21 @@
 READLINE=1
-ifdef DEBUG
-
-ifdef x64
-CFLAGS= /FS /Zi /WX /W3 /O2 /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DEBUG /NOLOGO /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
-else
-CFLAGS= /FS /Zi /WX /W3 /Ot /Oy- /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DEBUG /NOLOGO /STACK:0x10000000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
+ifeq (1,${DEBUG})
+FDEBUG = /FS /Zi
+LDEBUG = /DEBUG
 endif
-
-else
-
-ifdef x64
-CFLAGS= /WX /W3 /O2 /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /NOLOGO /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
-else
-CFLAGS= /WX /W3 /Ot /Oy- /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /NOLOGO /STACK:0x10000000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
+ifeq (1,${USE_THREAD})
+FUSE_THREAD = /DUSE_THREAD
+endif
+ifeq (1,${VERBOSELOG})
+FVERBOSELOG = /DVERBOSELOG
 endif
 
+ifeq (1,${x64})
+CFLAGS= ${FDEBUG} ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /NOLOGO /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
+else
+CFLAGS= ${FDEBUG} ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /WX /W3 /Ot /Oy- /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 endif
 
 .SUFFIXES: .o
@@ -51,7 +48,7 @@ $(TARGET) : $(OBJS) $(OBJSLN) jconsole.res
 	$(LD) /NOLOGO $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) jconsole.res
 
 jconsole.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/jconsole/makefile.win b/makemsvc/jconsole/makefile.win
@@ -1,24 +1,21 @@
 READLINE=1
-!ifdef DEBUG
-
-!ifdef x64
-CFLAGS= /FS /Zi /WX /W3 /O2 /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DEBUG /NOLOGO /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
-!else
-CFLAGS= /FS /Zi /WX /W3 /Ot /Oy- /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DEBUG /NOLOGO /STACK:0x10000000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
+!ifeq (1,${DEBUG})
+FDEBUG = /FS /Zi
+LDEBUG = /DEBUG
 !endif
-
-!else
-
-!ifdef x64
-CFLAGS= /WX /W3 /O2 /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /NOLOGO /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
-!else
-CFLAGS= /WX /W3 /Ot /Oy- /GS /D USE_THREAD /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /NOLOGO /STACK:0x10000000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
+!ifeq (1,${USE_THREAD})
+FUSE_THREAD = /DUSE_THREAD
+!endif
+!ifeq (1,${VERBOSELOG})
+FVERBOSELOG = /DVERBOSELOG
 !endif
 
+!ifeq (1,${x64})
+CFLAGS= ${FDEBUG} ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /NOLOGO /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
+!else
+CFLAGS= ${FDEBUG} ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /WX /W3 /Ot /Oy- /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 !endif
 
 .SUFFIXES: .o
@@ -51,7 +48,7 @@ $(TARGET) : $(OBJS) $(OBJSLN) jconsole.res
 	$(LD) /NOLOGO $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) jconsole.res
 
 jconsole.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/jdll/makefile b/makemsvc/jdll/makefile
@@ -1,47 +1,32 @@
-ifdef DEBUG
-
-ifdef x64
-ifdef JAVX2
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /DC_AVX=1 /D C_AVX2=1 /arch:AVX2 /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-else
-ifdef JAVX
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /DC_AVX=1 /arch:AVX /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-else
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+ifeq (1,${AVX})
+FAVX= /DC_AVX=1 /arch:AVX
 endif
+ifeq (1,${AVX2})
+FAVX2= /DC_AVX=1 /DC_AVX2=1 /arch:AVX2
 endif
-FLAGS= /DEBUG /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
-ASMFLAGS= /Cx
-else
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /WX /W3 /Ot /Oy- /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DEBUG /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
-ASMFLAGS= /Cx /coff
+ifeq (1,${DEBUG})
+FDEBUG = /FS /Zi
+LDEBUG = /DEBUG
 endif
-
-else
-
-ifdef x64
-ifdef JAVX2
-CFLAGS= /D _JDLL /D USE_THREAD /DC_AVX=1 /D C_AVX2=1 /arch:AVX2 /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-else
-ifdef JAVX
-CFLAGS= /D _JDLL /D USE_THREAD /DC_AVX=1 /arch:AVX /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-else
-CFLAGS= /D _JDLL /D USE_THREAD /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+ifeq (1,${USE_THREAD})
+FUSE_THREAD = /DUSE_THREAD
 endif
+ifeq (1,${VERBOSELOG})
+FVERBOSELOG = /DVERBOSELOG
 endif
-FLAGS= /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
+
+ifeq (1,${x64})
+CFLAGS= ${FDEBUG} /D_JDLL /DC_NA=0 ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /W3 /O2 /GS /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
 ASMFLAGS= /Cx
 else
 # /Og fail g310r
 # /Oy crash ]^:_"1[0
-CFLAGS= /D _JDLL /D USE_THREAD /WX /W3 /Ot /Oy- /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
+CFLAGS= ${FDEBUG} /D_JDLL ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /WX /W3 /Ot /Oy- /GS /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 ASMFLAGS= /Cx /coff
 endif
 
-endif
-
 .SUFFIXES: .o
 
 OBJS=  \
@@ -197,7 +182,7 @@ OBJS=  \
  ../../jsrc/openssl/sha/sha512.o
 
 ifdef NO_SHA_ASM
-CFLAGS1= /D NO_SHA_ASM
+CFLAGS1= /DNO_SHA_ASM
 else
 ifdef x64
 OBJS_ASM= \
@@ -248,7 +233,7 @@ $(TARGET) : $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(ASM) jdll.res
 	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(ASM) jdll.res ole32.lib advapi32.lib oleaut32.lib
 
 jdll.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/jdll/makefile.win b/makemsvc/jdll/makefile.win
@@ -1,47 +1,32 @@
-!ifdef DEBUG
-
-!ifdef x64
-!ifdef JAVX2
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /DC_AVX=1 /D C_AVX2=1 /arch:AVX2 /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-!else
-!ifdef JAVX
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /DC_AVX=1 /arch:AVX /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-!else
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+!ifeq (1,${AVX})
+FAVX= /DC_AVX=1 /arch:AVX
 !endif
+!ifeq (1,${AVX2})
+FAVX2= /DC_AVX=1 /DC_AVX2=1 /arch:AVX2
 !endif
-FLAGS= /DEBUG /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
-ASMFLAGS= /Cx
-!else
-CFLAGS= /FS /Zi /D _JDLL /D USE_THREAD /WX /W3 /Ot /Oy- /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DEBUG /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
-ASMFLAGS= /Cx /coff
+!ifeq (1,${DEBUG})
+FDEBUG = /FS /Zi
+LDEBUG = /DEBUG
 !endif
-
-!else
-
-!ifdef x64
-!ifdef JAVX2
-CFLAGS= /D _JDLL /D USE_THREAD /DC_AVX=1 /D C_AVX2=1 /arch:AVX2 /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-!else
-!ifdef JAVX
-CFLAGS= /D _JDLL /D USE_THREAD /DC_AVX=1 /arch:AVX /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-!else
-CFLAGS= /D _JDLL /D USE_THREAD /DC_NA=0 /WX /W3 /O2 /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+!ifeq (1,${USE_THREAD})
+FUSE_THREAD = /DUSE_THREAD
 !endif
+!ifeq (1,${VERBOSELOG})
+FVERBOSELOG = /DVERBOSELOG
 !endif
-FLAGS= /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
+
+!ifeq (1,${x64})
+CFLAGS= ${FDEBUG} /D_JDLL /DC_NA=0 ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /W3 /O2 /GS /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
 ASMFLAGS= /Cx
 !else
 # /Og fail g310r
 # /Oy crash ]^:_"1[0
-CFLAGS= /D _JDLL /D USE_THREAD /WX /W3 /Ot /Oy- /GS /Zc:strictStrings /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
-FLAGS= /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
+CFLAGS= ${FDEBUG} /D_JDLL ${FAVX} ${FAVX2} ${FUSE_THREAD} ${FVERBOSELOG} /WX /WX /W3 /Ot /Oy- /GS /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
+FLAGS= ${LDEBUG} /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 ASMFLAGS= /Cx /coff
 !endif
 
-!endif
-
 .SUFFIXES: .o
 
 OBJS=  \
@@ -197,7 +182,7 @@ OBJS=  \
  ../../jsrc/openssl/sha/sha512.o
 
 !ifdef NO_SHA_ASM
-CFLAGS1= /D NO_SHA_ASM
+CFLAGS1= /DNO_SHA_ASM
 !else
 !ifdef x64
 OBJS_ASM= \
@@ -248,7 +233,7 @@ $(TARGET) : $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(ASM) jdll.res
 	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(ASM) jdll.res ole32.lib advapi32.lib oleaut32.lib
 
 jdll.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/jnative/makefile b/makemsvc/jnative/makefile
@@ -1,8 +1,8 @@
 ifdef x64
-CFLAGS= /WX /W3 /O2 /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
 else
-CFLAGS= /WX /W3 /Ot /Oy- /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /Ot /Oy- /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 endif
 
@@ -29,7 +29,7 @@ $(TARGET) : $(OBJS)
 	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS)
 
 jddll.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/jnative/makefile.win b/makemsvc/jnative/makefile.win
@@ -1,8 +1,8 @@
 !ifdef x64
-CFLAGS= /WX /W3 /O2 /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
 !else
-CFLAGS= /WX /W3 /Ot /Oy- /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /Ot /Oy- /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 !endif
 
@@ -29,7 +29,7 @@ $(TARGET) : $(OBJS)
 	$(LD) /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS)
 
 jddll.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/makemsvc.txt b/makemsvc/makemsvc.txt
@@ -44,7 +44,7 @@ nmake -f makefile.win x64=1 JAVX2=1
 nmake -f makefile.win x64=1 JAVX=1 clean
 nmake -f makefile.win x64=1 JAVX=1
 nmake -f makefile.win x64=1 clean
-nmake -f makefile.win x64=1 
+nmake -f makefile.win x64=1
 cd ..
 
 3. build tsdll.dll -  used in test suite to validate cd

diff --git a/makemsvc/tsdll/makefile b/makemsvc/tsdll/makefile
@@ -1,8 +1,8 @@
 ifdef x64
-CFLAGS= /WX /W3 /O2 /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
 else
-CFLAGS= /WX /W3 /Ot /Oy- /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /M
+CFLAGS= /WX /W3 /Ot /Oy- /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /M
 FLAGS= /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 endif
 
@@ -29,7 +29,7 @@ $(TARGET) : $(OBJS)
 	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS)
 
 jddll.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 

diff --git a/makemsvc/tsdll/makefile.win b/makemsvc/tsdll/makefile.win
@@ -1,8 +1,8 @@
 !ifdef x64
-CFLAGS= /WX /W3 /O2 /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
 !else
-CFLAGS= /WX /W3 /Ot /Oy- /GS /D _USING_V110_SDK71_ /D _CRT_SECURE_NO_WARNINGS /MT
+CFLAGS= /WX /W3 /Ot /Oy- /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT
 FLAGS= /DLL /NOLOGO /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01
 !endif
 
@@ -29,7 +29,7 @@ $(TARGET) : $(OBJS)
 	$(LD) /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS)
 
 jddll.res : $(RCS)
-	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
+	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,3 @@ mkdir jbld\j64

		xcopy /E /Y /Q %1%\jsource\jlibrary jbld\j32\
		xcopy /E /Y /Q %1%\jsource\jlibrary jbld\j64\