From: yuanbowen <r03944049@ntu.edu.tw>
Date: Sun, 1 Mar 2015 05:01:51 +0000 (+0800)
Subject: [Update] set windows 64bit as default
X-Git-Tag: v200~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17d4de85137bcc399f2868178feea3422fbd7189;p=liblinear

[Update] set windows 64bit as default
---

diff --git a/Makefile.win b/Makefile.win
index 9f44d72..c4ad3bf 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,11 +1,5 @@
-#You must ensure nmake.exe, cl.exe, link.exe are in system path.
-#VCVARS32.bat
-#Under dosbox prompt
-#nmake -f Makefile.win
-
-##########################################
 CXX = cl.exe
-CFLAGS = /nologo /O2 /EHsc /I. /D _WIN32 /D _CRT_SECURE_NO_DEPRECATE
+CFLAGS = /nologo /O2 /EHsc /I. /D _WIN64 /D _CRT_SECURE_NO_DEPRECATE
 TARGET = windows
 
 all: $(TARGET)\train.exe $(TARGET)\predict.exe
diff --git a/README b/README
index 9ea3381..1b7fca5 100644
--- a/README
+++ b/README
@@ -523,7 +523,7 @@ Visual C++, use the following steps:
 1. Open a dos command box and change to liblinear directory. If
 environment variables of VC++ have not been set, type
 
-"C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
+""C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\vcvars64.bat""
 
 You may have to modify the above command according which version of
 VC++ or where it is installed.
@@ -532,9 +532,9 @@ VC++ or where it is installed.
 
 nmake -f Makefile.win clean all
 
-2. (Optional) To build 64-bit windows binaries, you must
-	(1) Setup vcvars64.bat instead of vcvars32.bat
-	(2) Change CFLAGS in Makefile.win: /D _WIN32 to /D _WIN64
+2. (Optional) To build 32-bit windows binaries, you must
+	(1) Setup "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" instead of vcvars64.bat
+	(2) Change CFLAGS in Makefile.win: /D _WIN64 to /D _WIN32
 
 MATLAB/OCTAVE Interface
 =======================