diff options
| author | unknown <hf@deer.(none)> | 2005-07-22 12:18:19 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-07-22 12:18:19 +0500 |
| commit | f1029fd7a79b24a0fa904a37e74f6e3c2684dba1 (patch) | |
| tree | 04200c58f911592806338cbd5b26d5c9c8703c37 /VC++Files | |
| parent | 17725b9d6d1ba6a1d5b151045c9edd4fb163945e (diff) | |
| parent | afd6b4e8ae09e640fcfc16d4a874177c55060ca5 (diff) | |
| download | mariadb-git-f1029fd7a79b24a0fa904a37e74f6e3c2684dba1.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.dsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 85bd8ca023e..49ecedfa055 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -72,7 +72,7 @@ LINK32=xilink6.exe # PROP Intermediate_Dir "debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../extra/yassl/include" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "SAFEMALLOC" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c # SUBTRACT CPP /X /Fr # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |