From 1e6dec02a33a796d0df23def77a555d979b40fdd Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Jun 2006 18:21:34 -0700 Subject: Fixed some dsp files. Fixed make_win_src_distribution.sh to return back dsp files for yassl. VC++Files/client/mysqldump.dsp: my_user.c was missing. VC++Files/client/mysqldump_ia64.dsp: my_user.c was missing. VC++Files/sql/mysqld.dsp: my_user.c was missing. VC++Files/sql/mysqld_ia64.dsp: my_user.c was missing. extra/yassl/yassl.dsp: Added the YASSL_PREFIX flag. scripts/make_win_src_distribution.sh: Returned back dsp files from yassl. --- VC++Files/client/mysqldump.dsp | 4 ++++ VC++Files/client/mysqldump_ia64.dsp | 4 ++++ VC++Files/sql/mysqld.dsp | 4 ++++ VC++Files/sql/mysqld_ia64.dsp | 4 ++++ extra/yassl/yassl.dsp | 8 ++++---- scripts/make_win_src_distribution.sh | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/VC++Files/client/mysqldump.dsp b/VC++Files/client/mysqldump.dsp index 527d1eb0a74..09f0df15ceb 100644 --- a/VC++Files/client/mysqldump.dsp +++ b/VC++Files/client/mysqldump.dsp @@ -128,6 +128,10 @@ SOURCE=.\mysqldump.c !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\sql-common\my_user.c # End Source File # End Target # End Project diff --git a/VC++Files/client/mysqldump_ia64.dsp b/VC++Files/client/mysqldump_ia64.dsp index 79a7059cae5..360d16ea8e4 100644 --- a/VC++Files/client/mysqldump_ia64.dsp +++ b/VC++Files/client/mysqldump_ia64.dsp @@ -131,6 +131,10 @@ SOURCE=.\mysqldump.c !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\sql-common\my_user.c # End Source File # End Target # End Project diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index 817e3224ea4..d44e61d8399 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -2052,6 +2052,10 @@ SOURCE=.\unireg.cpp !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\sql-common\my_user.c # End Source File # End Target # End Project diff --git a/VC++Files/sql/mysqld_ia64.dsp b/VC++Files/sql/mysqld_ia64.dsp index 310f48fcfb9..abf7ce4a4a2 100644 --- a/VC++Files/sql/mysqld_ia64.dsp +++ b/VC++Files/sql/mysqld_ia64.dsp @@ -2008,6 +2008,10 @@ SOURCE=.\unireg.cpp !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\sql-common\my_user.c # End Source File # End Target # End Project diff --git a/extra/yassl/yassl.dsp b/extra/yassl/yassl.dsp index dc090512743..58c016da448 100644 --- a/extra/yassl/yassl.dsp +++ b/extra/yassl/yassl.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -63,8 +63,8 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "include" /I "taocrypt\include" /I "mySTL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index c677db6a537..d9333540ab8 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -203,7 +203,7 @@ copy_dir_files() print_debug "Creating directory '$arg'" mkdir $BASE/$arg fi - for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy \ + for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy *dsp *.dsw \ README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ *.inc *.test *.result *.pem Moscow_leap des_key_file \ *.vcproj *.sln *.dat *.000001 *.require *.opt -- cgit v1.2.1