diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-06-15 17:32:04 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-06-15 18:42:57 +0300 |
| commit | eca5cf33b4be7cc38b96d2b31522a40c5f4027c2 (patch) | |
| tree | 7d51697d603777c77a032f5f6d388bdac2a95bb5 | |
| parent | a587ed6cd37bfca53b60e59733bc6900be70b7e5 (diff) | |
Use built-in support for .def files
| -rw-r--r-- | mysql/buildfile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mysql/buildfile b/mysql/buildfile index 4d87146..983f216 100644 --- a/mysql/buildfile +++ b/mysql/buildfile @@ -47,7 +47,7 @@ else vio/file{$regex.apply($vio_win32, '(.+)', '\1.c')} \ libmysql/authentication_win/file{*.h *.cpp } -lib{mysqlclient}: libmysql/file{libmysql_exports_win32.def} +lib{mysqlclient}: libmysql/def{libmysql_exports_win32} # See bootstrap.build for details. # @@ -127,7 +127,8 @@ else # Note that the original package defines the WIN32 macro for VC only, # relying on the fact that MinGW GCC defines it by default. However, the # macro disappears from the default ones if to compile with -std=c9x (as we - # do). So we define it for both VC and MinGW GCC. + # do). So we define it for both VC and MinGW GCC (though libmysqlclient + # doesn't support building with MinGW GCC at the moment). # cc.poptions += -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -DNOGDI -DNOMINMAX \ -DWIN32_LEAN_AND_MEAN -D_MBCS @@ -226,13 +227,8 @@ if ($tclass != 'windows') cc.libs += -lrt # Posix timers. } else -{ cc.libs += advapi32.lib - libs{mysqlclient}: \ - cc.libs =+ "/DEF:$src_base/libmysql/libmysql_exports_win32.def" -} - # The library clients must include the API header as <mysql/mysql.h>. # lib{mysqlclient}: cc.export.poptions = "-I$out_root" "-I$src_root" |