diff options
| author | Hakan Kuecuekyilmaz <hakan@askmonty.org> | 2010-06-24 22:40:30 +0200 |
|---|---|---|
| committer | Hakan Kuecuekyilmaz <hakan@askmonty.org> | 2010-06-24 22:40:30 +0200 |
| commit | 4ee9e66d87cc9ee265b502f803c6884fa3f45940 (patch) | |
| tree | d4e511782ae72ac7e0f678482f4d8d3f6ce03b4c /win/Makefile.am | |
| parent | 84074519a590c7843d49529b92ed557e5fa9cd63 (diff) | |
| download | mariadb-git-4ee9e66d87cc9ee265b502f803c6884fa3f45940.tar.gz | |
Make MariaDB compile with VS 2010
Most of the changes are backports from MySQL 5.5. Please note
that the 64-bit build fails with VS 2010 and the 32-bit build
has problems running mysql-test-run.pl.
* Added files for compiling with VS 2010 and added them
to Makefile.am.
* ifdef'ed ETIMEDOUT, because it is defined by VS 2010 now
* Removed not needed /MAP's from cmake files
Diffstat (limited to 'win/Makefile.am')
| -rw-r--r-- | win/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win/Makefile.am b/win/Makefile.am index fceebb07a59..18bfe8ddf81 100644 --- a/win/Makefile.am +++ b/win/Makefile.am @@ -17,7 +17,8 @@ EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat build-vs9.bat \ build-vs9_x64.bat configure.js README mysql_manifest.cmake \ create_manifest.js create_def_file.js build-nmake.bat \ - build-nmake-x64.bat configure-mariadb.sh make_mariadb_win_dist + build-nmake-x64.bat configure-mariadb.sh make_mariadb_win_dist \ + build-vs10.bat build-vs10_x64.bat # Don't update the files from bitkeeper %::SCCS/s.% |