Commit 62d80bad authored by calvin's avatar calvin

branches/zip: adjust build files on Windows

Adjust the patch positions based on the latest MySQL source.
Also add the patches to the .bat files for vs9.
parent d90bea08
diff -Nur CMakeLists.txt.orig CMakeLists.txt
--- CMakeLists.txt.orig 2008-10-03 12:25:41 -05:00
+++ CMakeLists.txt 2008-09-26 17:32:51 -05:00
@@ -244,9 +244,9 @@
@@ -254,9 +254,9 @@
IF(WITH_FEDERATED_STORAGE_ENGINE)
ADD_SUBDIRECTORY(storage/federated)
ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
......@@ -17,7 +17,7 @@ diff -Nur CMakeLists.txt.orig CMakeLists.txt
diff -Nur sql/CMakeLists.txt.orig sql/CMakeLists.txt
--- sql/CMakeLists.txt.orig 2008-10-03 12:25:41 -05:00
+++ sql/CMakeLists.txt 2008-09-24 03:58:19 -05:00
@@ -100,6 +100,15 @@
@@ -98,6 +98,15 @@
LINK_FLAGS "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
ENDIF(cmake_version EQUAL 20406)
......@@ -243,9 +243,9 @@ diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def
diff -Nur win/configure.js.orig win/configure.js
--- win/configure.js.orig 2008-09-26 21:18:37 -05:00
+++ win/configure.js 2008-10-01 11:21:27 -05:00
@@ -49,6 +49,7 @@
case "CYBOZU":
@@ -50,6 +50,7 @@
case "EMBED_MANIFESTS":
case "EXTRA_DEBUG":
case "WITH_EMBEDDED_SERVER":
+ case "INNODB_DYNAMIC_PLUGIN":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
......@@ -281,6 +281,7 @@ diff -Nur win/build-vs8.bat.orig win/build-vs8.bat
-cmake -G "Visual Studio 8 2005"
+cmake -G "Visual Studio 8 2005" -DCMAKE_BUILD_TYPE=%1
copy cmakecache.txt win\vs8cache.txt
diff -Nur win/build-vs8_x64.bat.orig win/build-vs8_x64.bat
--- win/build-vs8_x64.bat.orig 2008-08-20 10:21:59 -05:00
+++ win/build-vs8_x64.bat 2008-10-27 10:53:11 -05:00
......@@ -295,3 +296,23 @@ diff -Nur win/build-vs8_x64.bat.orig win/build-vs8_x64.bat
-cmake -G "Visual Studio 8 2005 Win64"
+cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_BUILD_TYPE=%1
copy cmakecache.txt win\vs8cache.txt
diff -Nur old/build-vs9.bat new/build-vs9.bat
--- win/build-vs9.bat.orig 2008-11-17 14:07:18 -06:00
+++ win/build-vs9.bat 2009-03-21 03:45:34 -05:00
@@ -14,5 +14,5 @@
REM You should have received a copy of the GNU General Public License
REM along with this program; if not, write to the Free Software
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-cmake -G "Visual Studio 9 2008"
+cmake -G "Visual Studio 9 2008" -DCMAKE_BUILD_TYPE=%1
diff -Nur old/build-vs9_x64.bat new/build-vs9_x64.bat
--- win/build-vs9_x64.bat.orig 2008-11-17 14:07:18 -06:00
+++ win/build-vs9_x64.bat 2009-03-21 03:45:42 -05:00
@@ -14,5 +14,5 @@
REM You should have received a copy of the GNU General Public License
REM along with this program; if not, write to the Free Software
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-cmake -G "Visual Studio 9 2008 Win64"
+cmake -G "Visual Studio 9 2008 Win64" -DCMAKE_BUILD_TYPE=%1
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment