Fix Makefile.win and update windows and matlab binaries

diff --git a/Makefile.win b/Makefile.win
index f5d91a64b7f19517cc39753a021c3ac0cf3e2cef..1b199701cd46a11777a0ba2b3b58ac531cd1778a 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -4,20 +4,20 @@ TARGET = windows
 
 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)\*.exe $(TARGET)\*.dll $(TARGET)\*.exp $(TARGET)\*.lib

diff --git a/windows/liblinear.dll b/windows/liblinear.dll
index 6b32017cc0140c2376c2401be698d240b24c3d7e..9f9051c0408266e70f3c8d4655f808f40ab98497 100755 (executable)
Binary files a/windows/liblinear.dll and b/windows/liblinear.dll differ

diff --git a/windows/libsvmread.mexw64 b/windows/libsvmread.mexw64
index e8f84d9c048136453e62a13356902e9373e4e96f..0fbf7de7eb63c7373e2c86fc3208a7adb56b1f54 100755 (executable)
Binary files a/windows/libsvmread.mexw64 and b/windows/libsvmread.mexw64 differ

diff --git a/windows/libsvmwrite.mexw64 b/windows/libsvmwrite.mexw64
index f3fd9a9b97adc2a472fe82d1bf231ccd2fe14d86..c4651753b914fbea08a415a4f9483d6da82bf573 100755 (executable)
Binary files a/windows/libsvmwrite.mexw64 and b/windows/libsvmwrite.mexw64 differ

diff --git a/windows/predict.exe b/windows/predict.exe
index 08fa8e08350fab8294be69787ee5d8e81a5db28d..0d9b262b33a7be734aa6ad70508e313039def5fd 100755 (executable)
Binary files a/windows/predict.exe and b/windows/predict.exe differ

diff --git a/windows/predict.mexw64 b/windows/predict.mexw64
index 7869e930e8495fa54a31454eb2ca22c47e746b04..4758c832278b568be41ebd06150223d4a621522c 100755 (executable)
Binary files a/windows/predict.mexw64 and b/windows/predict.mexw64 differ

diff --git a/windows/train.exe b/windows/train.exe
index bd75decc0c86e57644a0ddf85a614a2b4527c959..1ca1c04b00e9817be0e6404c2cd2d7b161bd2256 100755 (executable)
Binary files a/windows/train.exe and b/windows/train.exe differ

diff --git a/windows/train.mexw64 b/windows/train.mexw64
index a40cb5d5e30d564f8acc86f6b5db7ff960fef12d..61ef725a84d8e8aad539e82e6cb0f344c8e082a1 100755 (executable)
Binary files a/windows/train.mexw64 and b/windows/train.mexw64 differ