From: Wei-Lin Chiang Date: Mon, 20 Jul 2020 17:15:55 +0000 (+0800) Subject: Fix Makefile.win and update windows and matlab binaries X-Git-Tag: v240 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af4aad29392ace59e97536658f4761ca0b1db512;p=liblinear Fix Makefile.win and update windows and matlab binaries --- diff --git a/Makefile.win b/Makefile.win index f5d91a6..1b19970 100644 --- 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 6b32017..9f9051c 100755 Binary files a/windows/liblinear.dll and b/windows/liblinear.dll differ diff --git a/windows/libsvmread.mexw64 b/windows/libsvmread.mexw64 index e8f84d9..0fbf7de 100755 Binary files a/windows/libsvmread.mexw64 and b/windows/libsvmread.mexw64 differ diff --git a/windows/libsvmwrite.mexw64 b/windows/libsvmwrite.mexw64 index f3fd9a9..c465175 100755 Binary files a/windows/libsvmwrite.mexw64 and b/windows/libsvmwrite.mexw64 differ diff --git a/windows/predict.exe b/windows/predict.exe index 08fa8e0..0d9b262 100755 Binary files a/windows/predict.exe and b/windows/predict.exe differ diff --git a/windows/predict.mexw64 b/windows/predict.mexw64 index 7869e93..4758c83 100755 Binary files a/windows/predict.mexw64 and b/windows/predict.mexw64 differ diff --git a/windows/train.exe b/windows/train.exe index bd75dec..1ca1c04 100755 Binary files a/windows/train.exe and b/windows/train.exe differ diff --git a/windows/train.mexw64 b/windows/train.mexw64 index a40cb5d..61ef725 100755 Binary files a/windows/train.mexw64 and b/windows/train.mexw64 differ