diff options
| author | unknown <jperkin@production.mysql.com> | 2007-09-07 21:56:00 +0200 |
|---|---|---|
| committer | unknown <jperkin@production.mysql.com> | 2007-09-07 21:56:00 +0200 |
| commit | f2c71e6333682e9dbf9cbf29fcada1e1d821aceb (patch) | |
| tree | 4d0f6962d2066a371da24fa74356e761352cdb71 /win | |
| parent | 28562e9baf6b57c3adde6707c0bacd29ffe09f33 (diff) | |
| parent | 4fc66c2aa536e7533086f5534198a9b74a4bc128 (diff) | |
| download | mariadb-git-f2c71e6333682e9dbf9cbf29fcada1e1d821aceb.tar.gz | |
Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/push-5.0
into production.mysql.com:/usersnfs/jperkin/bk/trees/51/push-5.1
libmysql/libmysql.c:
Auto merged
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 |