mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
77e2894286
Remove some compiler warnings when using VC++ Add InnoDB in normal MySQL binary for windows. BitKeeper/deleted/.del-lib_load.cc~854092828128d7f9: Delete: libmysqld/lib_load.cc VC++Files/bdb/bdb.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysql.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqladmin.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqlclient.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqldump.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqlimport.dsp: Updated VC++ dsp files from windows build machine VC++Files/client/mysqlshow.dsp: Updated VC++ dsp files from windows build machine VC++Files/innobase/innobase.dsp: Updated VC++ dsp files from windows build machine VC++Files/libmysqld/libmysqld.dsp: Updated VC++ dsp files from windows build machine VC++Files/libmysqltest/myTest.dsp: Updated VC++ dsp files from windows build machine VC++Files/libmysqltest/mytest.c: Removed compiler warning for VC++ VC++Files/mysql.dsw: Add Innodb to standard binary VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated VC++ dsp files from windows build machine VC++Files/mysqlcheck/mysqlcheck.dsp: Updated VC++ dsp files from windows build machine VC++Files/mysqlmanager/MySqlManager.dsp: Updated VC++ dsp files from windows build machine VC++Files/mysys/mysys.dsp: Updated VC++ dsp files from windows build machine VC++Files/pack_isam/pack_isam.dsp: Updated VC++ dsp files from windows build machine VC++Files/perror/perror.dsp: Updated VC++ dsp files from windows build machine VC++Files/replace/replace.dsp: Updated VC++ dsp files from windows build machine VC++Files/sql/mysqld.dsp: Updated VC++ dsp files from windows build machine VC++Files/test1/test1.dsp: Updated VC++ dsp files from windows build machine VC++Files/thr_insert_test/thr_insert_test.dsp: Updated VC++ dsp files from windows build machine VC++Files/thr_test/thr_test.dsp: Updated VC++ dsp files from windows build machine VC++Files/vio/vio.dsp: Updated VC++ dsp files from windows build machine sql/item_strfunc.cc: Removed compiler warning on VC++ VC++Files/libmysql/libmysql.dsp: Updated VC++ dsp files from windows build machine
102 lines
3.5 KiB
Text
102 lines
3.5 KiB
Text
# Microsoft Developer Studio Project File - Name="test1" - Package Owner=<4>
|
|
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
|
# ** DO NOT EDIT **
|
|
|
|
# TARGTYPE "Win32 (x86) Console Application" 0x0103
|
|
|
|
CFG=test1 - 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 "test1.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 "test1.mak" CFG="test1 - Win32 Debug"
|
|
!MESSAGE
|
|
!MESSAGE Possible choices for configuration are:
|
|
!MESSAGE
|
|
!MESSAGE "test1 - Win32 Release" (based on "Win32 (x86) Console Application")
|
|
!MESSAGE "test1 - Win32 Debug" (based on "Win32 (x86) Console Application")
|
|
!MESSAGE
|
|
|
|
# Begin Project
|
|
# PROP AllowPerConfigDependencies 0
|
|
# PROP Scc_ProjName ""
|
|
# PROP Scc_LocalPath ""
|
|
CPP=cl.exe
|
|
RSC=rc.exe
|
|
|
|
!IF "$(CFG)" == "test1 - 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 Ignore_Export_Lib 0
|
|
# PROP Target_Dir ""
|
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
# ADD CPP /nologo /G6 /W3 /O2 /I "../include" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
|
|
# SUBTRACT CPP /YX
|
|
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
|
# ADD RSC /l 0x409 /d "NDEBUG"
|
|
BSC32=bscmake.exe
|
|
# ADD BASE BSC32 /nologo
|
|
# 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 /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 /nologo /subsystem:console /machine:I386
|
|
|
|
!ELSEIF "$(CFG)" == "test1 - 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 Ignore_Export_Lib 0
|
|
# PROP Target_Dir ""
|
|
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
|
|
# SUBTRACT CPP /YX
|
|
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
|
# ADD RSC /l 0x409 /d "_DEBUG"
|
|
BSC32=bscmake.exe
|
|
# ADD BASE BSC32 /nologo
|
|
# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
|
|
# ADD LINK32 libmysql.lib 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 /libpath:"..\lib_debug"
|
|
# SUBTRACT LINK32 /incremental:no
|
|
|
|
!ENDIF
|
|
|
|
# Begin Target
|
|
|
|
# Name "test1 - Win32 Release"
|
|
# Name "test1 - Win32 Debug"
|
|
# Begin Source File
|
|
|
|
SOURCE=.\mysql_thr.c
|
|
|
|
!IF "$(CFG)" == "test1 - Win32 Release"
|
|
|
|
# ADD CPP /MT
|
|
|
|
!ELSEIF "$(CFG)" == "test1 - Win32 Debug"
|
|
|
|
!ENDIF
|
|
|
|
# End Source File
|
|
# End Target
|
|
# End Project
|