From 0777bd04e474c85dc279eb8722c952d28d50487a Mon Sep 17 00:00:00 2001 From: unknown <venu@myvenu.com> Date: Thu, 20 Feb 2003 14:16:57 -0800 Subject: [PATCH] Fix .dsp files to have all new changes to work with src disribution package script VC++Files/client/mysqlclient.dsp: . VC++Files/libmysql/libmysql.dsp: . VC++Files/libmysqld/libmysqld.dsp: . VC++Files/myisammrg/myisammrg.dsp: . VC++Files/mysqlmanager/MySqlManager.dsp: . VC++Files/mysys/mysys.dsp: . VC++Files/strings/strings.dsp: . --- VC++Files/client/mysqlclient.dsp | 12 ++++ VC++Files/libmysql/libmysql.dsp | 19 +++++- VC++Files/libmysqld/libmysqld.dsp | 20 ++++-- VC++Files/myisammrg/myisammrg.dsp | 4 ++ VC++Files/mysqlmanager/MySqlManager.dsp | 24 +++++++ VC++Files/mysys/mysys.dsp | 4 ++ VC++Files/strings/strings.dsp | 84 ++++++++++--------------- 7 files changed, 108 insertions(+), 59 deletions(-) diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index 54cbf841a7..113a7e0d1f 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -128,6 +128,10 @@ SOURCE="..\strings\ctype-euc_kr.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-extra.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-gb2312.c" # End Source File # Begin Source File @@ -136,10 +140,18 @@ SOURCE="..\strings\ctype-gbk.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-latin1.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-latin1_de.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-mb.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-simple.c" # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 46b7b422f9..9811d07f47 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -139,6 +139,10 @@ SOURCE="..\strings\ctype-euc_kr.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-extra.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-gb2312.c" # End Source File # Begin Source File @@ -147,10 +151,18 @@ SOURCE="..\strings\ctype-gbk.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-latin1.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-latin1_de.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-mb.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-simple.c" # End Source File # Begin Source File @@ -260,7 +272,6 @@ SOURCE=..\mysys\my_alloc.c # Begin Source File SOURCE=..\mysys\my_compress.c -# ADD CPP /I "../zlib" # End Source File # Begin Source File @@ -360,7 +371,7 @@ SOURCE=..\mysys\my_thr_init.c # End Source File # Begin Source File -SOURCE=..\mysys\my_vsnprintf.c +SOURCE=..\strings\my_vsnprintf.c # End Source File # Begin Source File @@ -478,5 +489,9 @@ SOURCE=..\vio\viossl.c SOURCE=..\vio\viosslfactories.c # End Source File +# Begin Source File + +SOURCE=..\strings\xml.c +# End Source File # End Target # End Project diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 2a055ab34c..8a6bd4997d 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -52,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.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 /nologo /dll /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\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\bdb.lib ..\lib_release\zlib.lib # SUBTRACT LINK32 /nologo /dll /pdb:none /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" +# 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\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\bdb.lib ..\lib_release\zlib.lib /nologo /dll /pdb:none /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" !ELSEIF "$(CFG)" == "libmysqld - Win32 Debug" @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# 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_debug\dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib # SUBTRACT LINK32 /nologo /dll /pdb:none /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" +# 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_debug\dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib /nologo /dll /pdb:none /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" !ENDIF @@ -180,6 +180,10 @@ SOURCE=..\sql\item_func.cpp # End Source File # Begin Source File +SOURCE=.\item_row.cpp +# End Source File +# Begin Source File + SOURCE=..\sql\item_strfunc.cpp # End Source File # Begin Source File @@ -236,10 +240,6 @@ SOURCE=..\sql\mini_client.cpp # End Source File # Begin Source File -SOURCE=..\sql\net_pkg.cpp -# End Source File -# Begin Source File - SOURCE=..\sql\net_serv.cpp # End Source File # Begin Source File @@ -264,6 +264,10 @@ SOURCE=..\sql\procedure.cpp # End Source File # Begin Source File +SOURCE=.\protocol.cpp +# End Source File +# Begin Source File + SOURCE=..\sql\records.cpp # End Source File # Begin Source File @@ -328,6 +332,10 @@ SOURCE=..\sql\sql_handler.cpp # End Source File # Begin Source File +SOURCE=.\sql_help.cpp +# End Source File +# Begin Source File + SOURCE=..\sql\sql_insert.cpp # End Source File # Begin Source File diff --git a/VC++Files/myisammrg/myisammrg.dsp b/VC++Files/myisammrg/myisammrg.dsp index 9363bd63e6..b7b613b154 100644 --- a/VC++Files/myisammrg/myisammrg.dsp +++ b/VC++Files/myisammrg/myisammrg.dsp @@ -142,6 +142,10 @@ SOURCE=.\myrg_rnext.c # End Source File # Begin Source File +SOURCE=.\myrg_rnext_same.c +# End Source File +# Begin Source File + SOURCE=.\myrg_rprev.c # End Source File # Begin Source File diff --git a/VC++Files/mysqlmanager/MySqlManager.dsp b/VC++Files/mysqlmanager/MySqlManager.dsp index 6b86b8dd45..ae8e3ec5f0 100644 --- a/VC++Files/mysqlmanager/MySqlManager.dsp +++ b/VC++Files/mysqlmanager/MySqlManager.dsp @@ -101,10 +101,34 @@ SOURCE=.\ChildFrm.cpp # End Source File # Begin Source File +SOURCE="..\strings\ctype-extra.c" +# End Source File +# Begin Source File + +SOURCE="..\strings\ctype-latin1.c" +# End Source File +# Begin Source File + +SOURCE="..\strings\ctype-mb.c" +# End Source File +# Begin Source File + +SOURCE=..\strings\is_prefix.c +# End Source File +# Begin Source File + SOURCE=.\MainFrm.cpp # End Source File # Begin Source File +SOURCE=..\mysys\my_sleep.c +# End Source File +# Begin Source File + +SOURCE=..\strings\my_vsnprintf.c +# End Source File +# Begin Source File + SOURCE=.\MySqlManager.cpp # End Source File # Begin Source File diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp index eb96c1ed98..5f13c80f8e 100644 --- a/VC++Files/mysys/mysys.dsp +++ b/VC++Files/mysys/mysys.dsp @@ -410,6 +410,10 @@ SOURCE=.\my_seek.c # End Source File # Begin Source File +SOURCE=.\my_sleep.c +# End Source File +# Begin Source File + SOURCE=.\my_static.c # End Source File # Begin Source File diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp index 2f206b30ba..a60034d3ec 100644 --- a/VC++Files/strings/strings.dsp +++ b/VC++Files/strings/strings.dsp @@ -104,6 +104,10 @@ SOURCE=.\bmove512.c # End Source File # Begin Source File +SOURCE=.\bmove_upp.c +# End Source File +# Begin Source File + SOURCE=".\ctype-big5.c" # End Source File # Begin Source File @@ -120,6 +124,10 @@ SOURCE=".\ctype-euc_kr.c" # End Source File # Begin Source File +SOURCE=".\ctype-extra.c" +# End Source File +# Begin Source File + SOURCE=".\ctype-gb2312.c" # End Source File # Begin Source File @@ -128,6 +136,10 @@ SOURCE=".\ctype-gbk.c" # End Source File # Begin Source File +SOURCE=".\ctype-latin1.c" +# End Source File +# Begin Source File + SOURCE=".\ctype-latin1_de.c" # End Source File # Begin Source File @@ -168,6 +180,10 @@ SOURCE=.\int2str.c # End Source File # Begin Source File +SOURCE=.\is_prefix.c +# End Source File +# Begin Source File + SOURCE=.\llstr.c # End Source File # Begin Source File @@ -188,34 +204,27 @@ SOURCE=.\str2int.c # End Source File # Begin Source File -SOURCE=.\Strings.asm - -!IF "$(CFG)" == "strings - Win32 Release" - -# Begin Custom Build -OutDir=.\release -InputPath=.\Strings.asm -InputName=Strings - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "strings - Win32 Debug" +SOURCE=.\strcend.c +# End Source File +# Begin Source File -# Begin Custom Build -OutDir=.\debug -InputPath=.\Strings.asm -InputName=Strings +SOURCE=.\strend.c +# End Source File +# Begin Source File -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath) +SOURCE=.\strfill.c +# End Source File +# Begin Source File -# End Custom Build +SOURCE=.\strmake.c +# End Source File +# Begin Source File -!ENDIF +SOURCE=.\strmov.c +# End Source File +# Begin Source File +SOURCE=.\strnmov.c # End Source File # Begin Source File @@ -235,34 +244,7 @@ SOURCE=.\strtoull.c # End Source File # Begin Source File -SOURCE=.\Strxmov.asm - -!IF "$(CFG)" == "strings - Win32 Release" - -# Begin Custom Build -OutDir=.\release -InputPath=.\Strxmov.asm -InputName=Strxmov - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "strings - Win32 Debug" - -# Begin Custom Build -OutDir=.\debug -InputPath=.\Strxmov.asm -InputName=Strxmov - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - +SOURCE=.\strxmov.c # End Source File # Begin Source File -- 2.30.9