diff options
author | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
---|---|---|
committer | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
commit | ba0cd51eb19f1f8868901d4b2327e1c8f4745c19 (patch) | |
tree | 3b7d7d44c9a9850c900bf0c7499f62818e36ed84 /win | |
parent | db55af7c4073926e0b1b8ece0f50b4842a6a6d22 (diff) | |
parent | adb1d7a32787e1e5c40a739b9f2e990e67ba946f (diff) | |
download | mariadb-git-ba0cd51eb19f1f8868901d4b2327e1c8f4745c19.tar.gz |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
configure.in:
Auto merged
scripts/mysql_config.sh:
Auto merged
libmysql/libmysql.c:
Manual merge
Diffstat (limited to 'win')
-rw-r--r-- | win/build-nmake-x64.bat | 21 | ||||
-rw-r--r-- | win/build-nmake.bat | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/win/build-nmake-x64.bat b/win/build-nmake-x64.bat new file mode 100644 index 00000000000..f73574ac8de --- /dev/null +++ b/win/build-nmake-x64.bat @@ -0,0 +1,21 @@ +@echo off + +REM Copyright (C) 2006 MySQL AB +REM +REM This program is free software; you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation; version 2 of the License. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +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 + +if exist cmakecache.txt del cmakecache.txt +copy win\nmake_x64_cache.txt cmakecache.txt +cmake -G "NMake Makefiles" +copy cmakecache.txt win\nmake_x64_cache.txt diff --git a/win/build-nmake.bat b/win/build-nmake.bat new file mode 100644 index 00000000000..89505c08313 --- /dev/null +++ b/win/build-nmake.bat @@ -0,0 +1,21 @@ +@echo off + +REM Copyright (C) 2006 MySQL AB +REM +REM This program is free software; you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation; version 2 of the License. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +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 + +if exist cmakecache.txt del cmakecache.txt +copy win\nmake_cache.txt cmakecache.txt +cmake -G "NMake Makefiles" +copy cmakecache.txt win\nmake_cache.txt |