From 4fd9bad4cc03050c1c91b22f5660469ea8b97cca Mon Sep 17 00:00:00 2001 From: "monty@mashka.mysql.fi" <> Date: Tue, 21 Jan 2003 21:22:45 +0200 Subject: Update to VC++ build files --- VC++Files/sql/mysqld.dsp | 22 +++++---- VC++Files/sql/mysqld.dsw | 1 - VC++Files/sql/mysqldmax.dsp | 112 +++++++++++++++++++++---------------------- VC++Files/sql/old/mysqld.dsw | 1 - 4 files changed, 70 insertions(+), 66 deletions(-) (limited to 'VC++Files/sql') diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index 9d7514f10bb..e068ba8f164 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -28,7 +28,7 @@ CFG=mysqld - Win32 Release # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe +CPP=xicl6.exe RSC=rc.exe !IF "$(CFG)" == "mysqld - Win32 Release" @@ -52,7 +52,7 @@ RSC=rc.exe BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe +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 /nologo /subsystem:console /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\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-opt.exe" # SUBTRACT LINK32 /debug @@ -78,7 +78,7 @@ LINK32=link.exe BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe +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 /nologo /subsystem:console /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\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld.exe" /pdbtype:sept @@ -105,7 +105,7 @@ LINK32=link.exe BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe +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 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 @@ -133,7 +133,7 @@ LINK32=link.exe BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe +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\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\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe" # SUBTRACT BASE LINK32 /pdb:none /debug # 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-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-max-nt.exe" @@ -162,7 +162,7 @@ LINK32=link.exe BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe +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\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 /pdb:none /debug /machine:I386 /out:"../client_release/mysqld-opt.exe" # 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-max.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 /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-max.exe" # SUBTRACT LINK32 /debug @@ -464,8 +464,6 @@ SOURCE=.\item_func.cpp !IF "$(CFG)" == "mysqld - Win32 Release" -# ADD CPP /I "../zlib" - !ELSEIF "$(CFG)" == "mysqld - Win32 Debug" # ADD CPP /G5 /I "../zlib" @@ -662,6 +660,10 @@ SOURCE=.\mini_client.cpp # End Source File # Begin Source File +SOURCE=..\myisammrg\myrg_rnext_same.c +# End Source File +# Begin Source File + SOURCE=.\mysqld.cpp !IF "$(CFG)" == "mysqld - Win32 Release" @@ -779,6 +781,10 @@ SOURCE=.\procedure.cpp # End Source File # Begin Source File +SOURCE=.\protocol.cpp +# End Source File +# Begin Source File + SOURCE=.\records.cpp !IF "$(CFG)" == "mysqld - Win32 Release" diff --git a/VC++Files/sql/mysqld.dsw b/VC++Files/sql/mysqld.dsw index ed820ed7a90..67948565f66 100644 --- a/VC++Files/sql/mysqld.dsw +++ b/VC++Files/sql/mysqld.dsw @@ -26,4 +26,3 @@ Package=<3> }}} ############################################################################### - diff --git a/VC++Files/sql/mysqldmax.dsp b/VC++Files/sql/mysqldmax.dsp index 4d24d033c51..24ea83159d9 100644 --- a/VC++Files/sql/mysqldmax.dsp +++ b/VC++Files/sql/mysqldmax.dsp @@ -7,20 +7,20 @@ CFG=mysqldmax - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "mysqldmax.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "mysqldmax.mak" CFG="mysqldmax - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "mysqldmax - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "mysqldmax - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "mysqldmax - Win32 nt" (based on "Win32 (x86) Console Application") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -103,7 +103,7 @@ LINK32=link.exe # 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\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\zlib.lib ..\lib_release\innobase-nt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console /pdb:"NT/mysqld-nt.pdb" /map:"NT/mysqld-nt.map" /machine:I386 /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-nt.exe" # SUBTRACT LINK32 /pdb:none -!ENDIF +!ENDIF # Begin Target @@ -123,7 +123,7 @@ SOURCE=.\convert.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -139,7 +139,7 @@ SOURCE=.\derror.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -155,7 +155,7 @@ SOURCE=.\field.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -171,7 +171,7 @@ SOURCE=.\field_conv.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -187,7 +187,7 @@ SOURCE=.\filesort.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -231,7 +231,7 @@ SOURCE=.\handler.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -246,7 +246,7 @@ SOURCE=.\hash_filo.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -265,7 +265,7 @@ SOURCE=.\hostname.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -281,7 +281,7 @@ SOURCE=.\init.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -297,7 +297,7 @@ SOURCE=.\item.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -313,7 +313,7 @@ SOURCE=.\item_buff.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -329,7 +329,7 @@ SOURCE=.\item_cmpfunc.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -349,7 +349,7 @@ SOURCE=.\item_func.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -365,7 +365,7 @@ SOURCE=.\item_strfunc.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -381,7 +381,7 @@ SOURCE=.\item_sum.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -396,7 +396,7 @@ SOURCE=.\item_timefunc.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -412,7 +412,7 @@ SOURCE=.\item_uniq.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -428,7 +428,7 @@ SOURCE=.\key.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -444,7 +444,7 @@ SOURCE=.\lock.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -460,7 +460,7 @@ SOURCE=.\log.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -483,7 +483,7 @@ SOURCE=.\mf_iocache.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -507,7 +507,7 @@ SOURCE=.\mysqld.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -523,7 +523,7 @@ SOURCE=.\net_pkg.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -542,7 +542,7 @@ SOURCE=.\nt_servc.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -565,7 +565,7 @@ SOURCE=.\opt_range.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -588,7 +588,7 @@ SOURCE=.\password.c !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -604,7 +604,7 @@ SOURCE=.\procedure.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -620,7 +620,7 @@ SOURCE=.\records.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -640,7 +640,7 @@ SOURCE=.\sql_acl.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -660,7 +660,7 @@ SOURCE=.\sql_base.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -680,7 +680,7 @@ SOURCE=.\sql_class.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -704,7 +704,7 @@ SOURCE=.\sql_db.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -720,7 +720,7 @@ SOURCE=.\sql_delete.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -736,7 +736,7 @@ SOURCE=.\sql_insert.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -752,7 +752,7 @@ SOURCE=.\sql_lex.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -768,7 +768,7 @@ SOURCE=.\sql_list.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -784,7 +784,7 @@ SOURCE=.\sql_load.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -804,7 +804,7 @@ SOURCE=.\sql_map.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -820,7 +820,7 @@ SOURCE=.\sql_parse.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -844,7 +844,7 @@ SOURCE=.\sql_select.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -860,7 +860,7 @@ SOURCE=.\sql_show.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -876,7 +876,7 @@ SOURCE=.\sql_string.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -892,7 +892,7 @@ SOURCE=.\sql_table.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -908,7 +908,7 @@ SOURCE=.\sql_test.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -924,7 +924,7 @@ SOURCE=.\sql_update.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -940,7 +940,7 @@ SOURCE=.\sql_yacc.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -960,7 +960,7 @@ SOURCE=.\thr_malloc.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -976,7 +976,7 @@ SOURCE=.\time.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -992,7 +992,7 @@ SOURCE=.\unireg.cpp !ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" -!ENDIF +!ENDIF # End Source File # Begin Source File diff --git a/VC++Files/sql/old/mysqld.dsw b/VC++Files/sql/old/mysqld.dsw index ed820ed7a90..67948565f66 100644 --- a/VC++Files/sql/old/mysqld.dsw +++ b/VC++Files/sql/old/mysqld.dsw @@ -26,4 +26,3 @@ Package=<3> }}} ############################################################################### - -- cgit v1.2.1