diff options
author | monty@mysql.com <> | 2004-05-27 23:45:22 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-05-27 23:45:22 +0300 |
commit | e9b7e3baa8f6c48360c76c4f61ccc474e9703805 (patch) | |
tree | e6a68f74869e5c89bff76d93a95a162b9404b595 /VC++Files | |
parent | 3ad2158b42a327e325c46c8fbaeabfca6b37f52f (diff) | |
parent | 1aa3b2c79e8ec5903a80f21226e6219ed60f2a9d (diff) | |
download | mariadb-git-e9b7e3baa8f6c48360c76c4f61ccc474e9703805.tar.gz |
merge with 4.0 to get fix to VC++ project files
Diffstat (limited to 'VC++Files')
-rw-r--r-- | VC++Files/sql/mysqld.dsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index fccecc7fa3c..3f6b591cbdb 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\dbug.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe" # SUBTRACT LINK32 /pdb:none /debug |