update version number of setup.py because of mistakes in testing PyPI.

[liblinear] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index c5c721fae9b955bc290c2d25b95f1f9c32e0ecf4..1b199701cd46a11777a0ba2b3b58ac531cd1778a 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,30 +1,24 @@
-#You must ensure nmake.exe, cl.exe, link.exe are in system path.
-#VCVARS32.bat
-#Under dosbox prompt
-#nmake -f Makefile.win
-
-##########################################
-CXXC = cl.exe
-CFLAGS = -nologo -O2 -EHsc -I. -D __WIN32__ -D _CRT_SECURE_NO_DEPRECATE
+CXX = cl.exe
+CFLAGS = /nologo /O2 /EHsc /I. /D _WIN64 /D _CRT_SECURE_NO_DEPRECATE
 TARGET = windows
 
-all: $(TARGET)\train.exe $(TARGET)\predict.exe
+all: $(TARGET)\train.exe $(TARGET)\predict.exe lib
 
-$(TARGET)\train.exe: tron.obj linear.obj train.c blas\*.c
-       $(CXX) $(CFLAGS) -Fe$(TARGET)\train.exe tron.obj linear.obj train.c blas\*.c
+$(TARGET)\train.exe: newton.obj linear.obj train.c blas\*.c
+       $(CXX) $(CFLAGS) -Fe$(TARGET)\train.exe newton.obj linear.obj train.c blas\*.c
 
-$(TARGET)\predict.exe: tron.obj linear.obj predict.c blas\*.c
-       $(CXX) $(CFLAGS) -Fe$(TARGET)\predict.exe tron.obj linear.obj predict.c blas\*.c
+$(TARGET)\predict.exe: newton.obj linear.obj predict.c blas\*.c
+       $(CXX) $(CFLAGS) -Fe$(TARGET)\predict.exe newton.obj linear.obj predict.c blas\*.c
 
 linear.obj: linear.cpp linear.h
        $(CXX) $(CFLAGS) -c linear.cpp
 
-tron.obj: tron.cpp tron.h
-       $(CXX) $(CFLAGS) -c tron.cpp
+newton.obj: newton.cpp newton.h
+       $(CXX) $(CFLAGS) -c newton.cpp
 
-lib: linear.cpp linear.h linear.def tron.obj
-       $(CXX) $(CFLAGS) -LD linear.cpp tron.obj blas\*.c -Fe$(TARGET)\liblinear -link -DEF:linear.def 
+lib: linear.cpp linear.h linear.def newton.obj
+       $(CXX) $(CFLAGS) -LD linear.cpp newton.obj blas\*.c -Fe$(TARGET)\liblinear -link -DEF:linear.def
 
 clean:
-        -erase /Q *.obj $(TARGET)\.
+        -erase /Q *.obj $(TARGET)\*.exe $(TARGET)\*.dll $(TARGET)\*.exp $(TARGET)\*.lib