mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
7311cbe7de
Portability fixes. Removed compiler warnings. VC++Files/client/mysql.dsp: Updated to 4.0.2 VC++Files/client/mysqladmin.dsp: Updated to 4.0.2 VC++Files/client/mysqlclient.dsp: Updated to 4.0.2 VC++Files/client/mysqldump.dsp: Updated to 4.0.2 VC++Files/client/mysqlimport.dsp: Updated to 4.0.2 VC++Files/client/mysqlshow.dsp: Updated to 4.0.2 VC++Files/innobase/innobase.dsp: Updated to 4.0.2 VC++Files/libmysql/libmySQL.dsp: Updated to 4.0.2 VC++Files/libmysqltest/myTest.dsp: Updated to 4.0.2 VC++Files/merge/merge.dsp: Updated to 4.0.2 VC++Files/myisam/myisam.dsp: Updated to 4.0.2 VC++Files/mysql.dsw: Updated to 4.0.2 VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated to 4.0.2 VC++Files/mysqlcheck/mysqlcheck.dsp: Updated to 4.0.2 VC++Files/mysqlmanager/MySqlManager.dsp: Updated to 4.0.2 VC++Files/mysys/mysys.dsp: Updated to 4.0.2 VC++Files/pack_isam/pack_isam.dsp: Updated to 4.0.2 VC++Files/perror/perror.dsp: Updated to 4.0.2 VC++Files/replace/replace.dsp: Updated to 4.0.2 VC++Files/sql/mysqld.dsp: Updated to 4.0.2 VC++Files/test1/test1.dsp: Updated to 4.0.2 VC++Files/thr_insert_test/thr_insert_test.dsp: Updated to 4.0.2 VC++Files/thr_test/thr_test.dsp: Updated to 4.0.2 VC++Files/vio/vio.dsp: Updated to 4.0.2 VC++Files/zlib/zlib.dsp: Updated to 4.0.2 include/config-win.h: Added isnan() and finite() include/myisam.h: Move thr_xxx functions to myisam_priv.h myisam/mi_check.c: Portability fix. myisam/mi_locking.c: Comment cleanup myisam/myisamchk.c: Removed compiler warning myisam/myisamdef.h: Added thr_xxx functions myisam/sort.c: Portability fix sql/field.cc: Portability fix sql/sql_insert.cc: R
134 lines
3.2 KiB
Text
134 lines
3.2 KiB
Text
# Microsoft Developer Studio Project File - Name="merge" - Package Owner=<4>
|
|
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
|
# ** DO NOT EDIT **
|
|
|
|
# TARGTYPE "Win32 (x86) Static Library" 0x0104
|
|
|
|
CFG=merge - 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 NMAKE /f "merge.mak".
|
|
!MESSAGE
|
|
!MESSAGE You can specify a configuration when running NMAKE
|
|
!MESSAGE by defining the macro CFG on the command line. For example:
|
|
!MESSAGE
|
|
!MESSAGE NMAKE /f "merge.mak" CFG="merge - Win32 Debug"
|
|
!MESSAGE
|
|
!MESSAGE Possible choices for configuration are:
|
|
!MESSAGE
|
|
!MESSAGE "merge - Win32 Release" (based on "Win32 (x86) Static Library")
|
|
!MESSAGE "merge - Win32 Debug" (based on "Win32 (x86) Static Library")
|
|
!MESSAGE
|
|
|
|
# Begin Project
|
|
# PROP AllowPerConfigDependencies 0
|
|
# PROP Scc_ProjName ""
|
|
# PROP Scc_LocalPath ""
|
|
CPP=cl.exe
|
|
RSC=rc.exe
|
|
|
|
!IF "$(CFG)" == "merge - Win32 Release"
|
|
|
|
# PROP BASE Use_MFC 0
|
|
# PROP BASE Use_Debug_Libraries 0
|
|
# PROP BASE Output_Dir "Release"
|
|
# PROP BASE Intermediate_Dir "Release"
|
|
# PROP BASE Target_Dir ""
|
|
# PROP Use_MFC 0
|
|
# PROP Use_Debug_Libraries 0
|
|
# PROP Output_Dir "release"
|
|
# PROP Intermediate_Dir "release"
|
|
# PROP Target_Dir ""
|
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
|
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
|
|
# SUBTRACT CPP /YX
|
|
# ADD BASE RSC /l 0x409
|
|
# ADD RSC /l 0x409
|
|
BSC32=bscmake.exe
|
|
# ADD BASE BSC32 /nologo
|
|
# ADD BSC32 /nologo
|
|
LIB32=link.exe -lib
|
|
# ADD BASE LIB32 /nologo
|
|
# ADD LIB32 /nologo /out:"..\lib_release\merge.lib"
|
|
|
|
!ELSEIF "$(CFG)" == "merge - Win32 Debug"
|
|
|
|
# PROP BASE Use_MFC 0
|
|
# PROP BASE Use_Debug_Libraries 1
|
|
# PROP BASE Output_Dir "Debug"
|
|
# PROP BASE Intermediate_Dir "Debug"
|
|
# PROP BASE Target_Dir ""
|
|
# PROP Use_MFC 0
|
|
# PROP Use_Debug_Libraries 1
|
|
# PROP Output_Dir "debug"
|
|
# PROP Intermediate_Dir "debug"
|
|
# PROP Target_Dir ""
|
|
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
|
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
|
|
# SUBTRACT CPP /YX
|
|
# ADD BASE RSC /l 0x409
|
|
# ADD RSC /l 0x409
|
|
BSC32=bscmake.exe
|
|
# ADD BASE BSC32 /nologo
|
|
# ADD BSC32 /nologo
|
|
LIB32=link.exe -lib
|
|
# ADD BASE LIB32 /nologo
|
|
# ADD LIB32 /nologo /out:"..\lib_debug\merge.lib"
|
|
|
|
!ENDIF
|
|
|
|
# Begin Target
|
|
|
|
# Name "merge - Win32 Release"
|
|
# Name "merge - Win32 Debug"
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_close.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_create.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_delete.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_extra.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_info.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_locking.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_open.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_panic.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_rrnd.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_rsame.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_static.c
|
|
# End Source File
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mrg_update.c
|
|
# End Source File
|
|
# End Target
|
|
# End Project
|