From b9aa53473157dd9060de4d03fbd70e3f72a415f9 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 23 Dec 2011 12:31:40 -0500 Subject: Update Windows installer script for MySQL 5.5 --- install.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/install.js b/install.js index bd02fc011..80778e6df 100644 --- a/install.js +++ b/install.js @@ -58,8 +58,8 @@ var installerQuestions = [ f.WriteLine("MYSQL_C=mysql.c"); f.WriteLine("MYSQL_O=mysql.obj"); f.WriteLine("BASE_CFLAGS=/D USE_MYSQL /D USE_RDB $(BASE_CFLAGS) /D HAVE_MYSQL_MYSQL_H"); - f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) /DEF:src\mypasql.def libmysql.lib zlib.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib"); - f.WriteLine("LIBS=$(LIBS) libmysql.lib zlib.lib"); + f.WriteLine("MYPASQL_BUILD=$(CC) /LD $(MYSQL_INC_PATH) src\\mypasql.c /link $(MYSQL_LIB_PATH) $(LFLAGS) /DEF:src\mypasql.def libmysql.lib ws2_32.lib advapi32.lib /NODEFAULTLIB:LIBCMTD.lib"); + f.WriteLine("LIBS=$(LIBS) libmysql.lib"); } else { f.WriteLine("USE_MYSQL=0"); @@ -203,6 +203,19 @@ var buildPackages = [ var mysqlVersions = [ + + { + 'name' : 'MySQL 5.5', + 'libpaths' : [ + 'Program Files\\MySQL\\MySQL Server 5.5\\Lib' + ], + 'incpaths' : [ + 'Program Files\\MySQL\\MySQL Server 5.5\\Include' + ], + 'dllfile' : 'Program Files\\MySQL\\MySQL Server 5.5\\bin\\libmysql.dll', + 'installedDrive' : 'C' + }, + { 'name' : 'MySQL 5.1', 'libpaths' : [ -- cgit