From da1623ddbb4dba3c4b2c56bcad52fd6bd5fb8836 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 May 2004 02:28:44 +0300 Subject: New MYSQL_SERVER_SUFFIX usage (for easier compilation) Update of VC++ project files. VC++Files/mysqlmanager/childfrm.cpp: Rename: VC++Files/mysqlmanager/CHILDFRM.CPP -> VC++Files/mysqlmanager/childfrm.cpp VC++Files/mysqlmanager/childfrm.h: Rename: VC++Files/mysqlmanager/CHILDFRM.H -> VC++Files/mysqlmanager/childfrm.h VC++Files/mysqlmanager/mainfrm.cpp: Rename: VC++Files/mysqlmanager/MAINFRM.CPP -> VC++Files/mysqlmanager/mainfrm.cpp VC++Files/mysqlmanager/mainfrm.h: Rename: VC++Files/mysqlmanager/MAINFRM.H -> VC++Files/mysqlmanager/mainfrm.h VC++Files/mysqlmanager/mysqlmanager.dsp: Rename: VC++Files/mysqlmanager/MySqlManager.dsp -> VC++Files/mysqlmanager/mysqlmanager.dsp VC++Files/mysqlmanager/mysqlmanager.mak: Rename: VC++Files/mysqlmanager/MySqlManager.mak -> VC++Files/mysqlmanager/mysqlmanager.mak VC++Files/mysqlmanager/resource.h: Rename: VC++Files/mysqlmanager/RESOURCE.H -> VC++Files/mysqlmanager/resource.h VC++Files/mysqlmanager/stdafx.cpp: Rename: VC++Files/mysqlmanager/STDAFX.CPP -> VC++Files/mysqlmanager/stdafx.cpp VC++Files/mysqlmanager/stdafx.h: Rename: VC++Files/mysqlmanager/STDAFX.H -> VC++Files/mysqlmanager/stdafx.h VC++Files/mysqlmanager/toolsql.cpp: Rename: VC++Files/mysqlmanager/TOOLSQL.CPP -> VC++Files/mysqlmanager/toolsql.cpp VC++Files/mysqlmanager/toolsql.h: Rename: VC++Files/mysqlmanager/TOOLSQL.H -> VC++Files/mysqlmanager/toolsql.h VC++Files/mysqlmanager/RES/bitmap1.bmp: Rename: VC++Files/mysqlmanager/RES/BITMAP1.BMP -> VC++Files/mysqlmanager/RES/bitmap1.bmp VC++Files/mysqlmanager/RES/bitmap3.bmp: Rename: VC++Files/mysqlmanager/RES/BITMAP3.BMP -> VC++Files/mysqlmanager/RES/bitmap3.bmp VC++Files/mysqlmanager/RES/bmp00001.bmp: Rename: VC++Files/mysqlmanager/RES/BMP00001.BMP -> VC++Files/mysqlmanager/RES/bmp00001.bmp VC++Files/mysqlmanager/RES/bmp00002.bmp: Rename: VC++Files/mysqlmanager/RES/BMP00002.BMP -> VC++Files/mysqlmanager/RES/bmp00002.bmp VC++Files/mysqlmanager/RES/database.bmp: Rename: VC++Files/mysqlmanager/RES/DATABASE.BMP -> VC++Files/mysqlmanager/RES/database.bmp VC++Files/mysqlmanager/RES/fontd.bmp: Rename: VC++Files/mysqlmanager/RES/FONTD.BMP -> VC++Files/mysqlmanager/RES/fontd.bmp VC++Files/mysqlmanager/RES/fontu.bmp: Rename: VC++Files/mysqlmanager/RES/FONTU.BMP -> VC++Files/mysqlmanager/RES/fontu.bmp VC++Files/mysqlmanager/RES/query_ex.bmp: Rename: VC++Files/mysqlmanager/RES/QUERY_EX.BMP -> VC++Files/mysqlmanager/RES/query_ex.bmp VC++Files/mysqlmanager/RES/toolbar.bmp: Rename: VC++Files/mysqlmanager/RES/TOOLBAR.BMP -> VC++Files/mysqlmanager/RES/toolbar.bmp BUILD/compile-pentium-valgrind-max: Use MYSQL_SERVER_SUFFIX VC++Files/bdb/bdb.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysql.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqladmin.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqldump.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqlimport.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/client/mysqlshow.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/copy_mysql_files.bat: Assume we are in correct directory VC++Files/innobase/innobase.dsp: Use new version of MYSQL_SERVER_SUFFIX Remove old files VC++Files/isamchk/isamchk.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/libmysqld/libmysqld.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/my_print_defaults/my_print_defaults.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/myisamchk/myisamchk.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/myisamlog/myisamlog.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/myisampack/myisampack.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysql.dsw: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysqlbinlog/mysqlbinlog.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysqlcheck/mysqlcheck.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/mysys/mysys.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/pack_isam/pack_isam.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/perror/perror.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/replace/replace.dsp: Use new version of MYSQL_SERVER_SUFFIX VC++Files/sql/mysqld.dsp: Use new version of MYSQL_SERVER_SUFFIX include/my_global.h: Added QUOTE and STRINGIFY include/mysql_version.h.in: New MYSQL_SERVER_SUFFIX handling innobase/eval/eval0eval.c: Fixed compiler warning libmysql/libmysql.c: Use STRINGIFY() sql/mysqld.cc: New MYSQL_SERVER_SUFFIX handling sql/mysqld_suffix.h: New MYSQL_SERVER_SUFFIX handling sql/set_var.cc: Use STRINGIFY() zlib/contrib/asm386/zlibvc.dsp: Updated for 4.0 --- VC++Files/mysqlmanager/mysqlmanager.mak | 327 ++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) create mode 100644 VC++Files/mysqlmanager/mysqlmanager.mak (limited to 'VC++Files/mysqlmanager/mysqlmanager.mak') diff --git a/VC++Files/mysqlmanager/mysqlmanager.mak b/VC++Files/mysqlmanager/mysqlmanager.mak new file mode 100644 index 00000000000..b372daa52f2 --- /dev/null +++ b/VC++Files/mysqlmanager/mysqlmanager.mak @@ -0,0 +1,327 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on MySqlManager.dsp +!IF "$(CFG)" == "" +CFG=MySqlManager - Win32 Debug +!MESSAGE No configuration specified. Defaulting to MySqlManager - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "MySqlManager - Win32 Release" && "$(CFG)" != "MySqlManager - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!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 "MySqlManager.mak" CFG="MySqlManager - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "MySqlManager - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "MySqlManager - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "MySqlManager - Win32 Release" + +OUTDIR=.\release +INTDIR=.\release +# Begin Custom Macros +OutDir=.\release +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "..\client_release\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch" + +!ELSE + +ALL : "mysqlclient - Win32 Release" "..\client_release\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"mysqlclient - Win32 ReleaseCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\ChildFrm.obj" + -@erase "$(INTDIR)\MainFrm.obj" + -@erase "$(INTDIR)\MySqlManager.obj" + -@erase "$(INTDIR)\MySqlManager.pch" + -@erase "$(INTDIR)\MySqlManager.res" + -@erase "$(INTDIR)\MySqlManagerDoc.obj" + -@erase "$(INTDIR)\MySqlManagerView.obj" + -@erase "$(INTDIR)\RegisterServer.obj" + -@erase "$(INTDIR)\StdAfx.obj" + -@erase "$(INTDIR)\ToolSql.obj" + -@erase "$(INTDIR)\ToolSqlQuery.obj" + -@erase "$(INTDIR)\ToolSqlResults.obj" + -@erase "$(INTDIR)\ToolSqlStatus.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "..\client_release\MySqlManager.exe" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP_PROJ=/nologo /G6 /MT /W3 /GX /O1 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\MySqlManager.res" /d "NDEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\MySqlManager.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=/nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\MySqlManager.pdb" /machine:I386 /out:"../client_release/MySqlManager.exe" +LINK32_OBJS= \ + "$(INTDIR)\ChildFrm.obj" \ + "$(INTDIR)\MainFrm.obj" \ + "$(INTDIR)\MySqlManager.obj" \ + "$(INTDIR)\MySqlManagerDoc.obj" \ + "$(INTDIR)\MySqlManagerView.obj" \ + "$(INTDIR)\RegisterServer.obj" \ + "$(INTDIR)\StdAfx.obj" \ + "$(INTDIR)\ToolSql.obj" \ + "$(INTDIR)\ToolSqlQuery.obj" \ + "$(INTDIR)\ToolSqlResults.obj" \ + "$(INTDIR)\ToolSqlStatus.obj" \ + "$(INTDIR)\MySqlManager.res" \ + "..\lib_release\mysqlclient.lib" + +"..\client_release\MySqlManager.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ELSEIF "$(CFG)" == "MySqlManager - Win32 Debug" + +OUTDIR=.\debug +INTDIR=.\debug +# Begin Custom Macros +OutDir=.\debug +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "..\client_debug\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch" + +!ELSE + +ALL : "mysqlclient - Win32 Debug" "..\client_debug\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"mysqlclient - Win32 DebugCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\ChildFrm.obj" + -@erase "$(INTDIR)\MainFrm.obj" + -@erase "$(INTDIR)\MySqlManager.obj" + -@erase "$(INTDIR)\MySqlManager.pch" + -@erase "$(INTDIR)\MySqlManager.res" + -@erase "$(INTDIR)\MySqlManagerDoc.obj" + -@erase "$(INTDIR)\MySqlManagerView.obj" + -@erase "$(INTDIR)\RegisterServer.obj" + -@erase "$(INTDIR)\StdAfx.obj" + -@erase "$(INTDIR)\ToolSql.obj" + -@erase "$(INTDIR)\ToolSqlQuery.obj" + -@erase "$(INTDIR)\ToolSqlResults.obj" + -@erase "$(INTDIR)\ToolSqlStatus.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\vc60.pdb" + -@erase "$(OUTDIR)\MySqlManager.pdb" + -@erase "..\client_debug\MySqlManager.exe" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +MTL_PROJ=/nologo /D "_DEBUG" /o "NUL" /win32 +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\MySqlManager.res" /d "_DEBUG" +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\MySqlManager.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\MySqlManager.pdb" /debug /machine:I386 /out:"../client_debug/MySqlManager.exe" /pdbtype:sept /libpath:"..\lib_debug\\" +LINK32_OBJS= \ + "$(INTDIR)\ChildFrm.obj" \ + "$(INTDIR)\MainFrm.obj" \ + "$(INTDIR)\MySqlManager.obj" \ + "$(INTDIR)\MySqlManagerDoc.obj" \ + "$(INTDIR)\MySqlManagerView.obj" \ + "$(INTDIR)\RegisterServer.obj" \ + "$(INTDIR)\StdAfx.obj" \ + "$(INTDIR)\ToolSql.obj" \ + "$(INTDIR)\ToolSqlQuery.obj" \ + "$(INTDIR)\ToolSqlResults.obj" \ + "$(INTDIR)\ToolSqlStatus.obj" \ + "$(INTDIR)\MySqlManager.res" \ + "..\lib_debug\mysqlclient.lib" + +"..\client_debug\MySqlManager.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("MySqlManager.dep") +!INCLUDE "MySqlManager.dep" +!ELSE +!MESSAGE Warning: cannot find "MySqlManager.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "MySqlManager - Win32 Release" || "$(CFG)" == "MySqlManager - Win32 Debug" +SOURCE=.\ChildFrm.cpp + +"$(INTDIR)\ChildFrm.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\MainFrm.cpp + +"$(INTDIR)\MainFrm.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\MySqlManager.cpp + +"$(INTDIR)\MySqlManager.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\MySqlManager.rc + +"$(INTDIR)\MySqlManager.res" : $(SOURCE) "$(INTDIR)" + $(RSC) $(RSC_PROJ) $(SOURCE) + + +SOURCE=.\MySqlManagerDoc.cpp + +"$(INTDIR)\MySqlManagerDoc.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\MySqlManagerView.cpp + +"$(INTDIR)\MySqlManagerView.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\RegisterServer.cpp + +"$(INTDIR)\RegisterServer.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\StdAfx.cpp + +!IF "$(CFG)" == "MySqlManager - Win32 Release" + +CPP_SWITCHES=/nologo /G6 /MT /W3 /GX /O1 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fp"$(INTDIR)\MySqlManager.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +"$(INTDIR)\StdAfx.obj" "$(INTDIR)\MySqlManager.pch" : $(SOURCE) "$(INTDIR)" + $(CPP) @<< + $(CPP_SWITCHES) $(SOURCE) +<< + + +!ELSEIF "$(CFG)" == "MySqlManager - Win32 Debug" + +CPP_SWITCHES=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\MySqlManager.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +"$(INTDIR)\StdAfx.obj" "$(INTDIR)\MySqlManager.pch" : $(SOURCE) "$(INTDIR)" + $(CPP) @<< + $(CPP_SWITCHES) $(SOURCE) +<< + + +!ENDIF + +SOURCE=.\ToolSql.cpp + +"$(INTDIR)\ToolSql.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\ToolSqlQuery.cpp + +"$(INTDIR)\ToolSqlQuery.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\ToolSqlResults.cpp + +"$(INTDIR)\ToolSqlResults.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\ToolSqlStatus.cpp + +"$(INTDIR)\ToolSqlStatus.obj" : $(SOURCE) "$(INTDIR)" + + +!IF "$(CFG)" == "MySqlManager - Win32 Release" + +"mysqlclient - Win32 Release" : + cd "\MYSQL-3.23\client" + $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Release" + cd "..\mysqlmanager" + +"mysqlclient - Win32 ReleaseCLEAN" : + cd "\MYSQL-3.23\client" + $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Release" RECURSE=1 CLEAN + cd "..\mysqlmanager" + +!ELSEIF "$(CFG)" == "MySqlManager - Win32 Debug" + +"mysqlclient - Win32 Debug" : + cd "\MYSQL-3.23\client" + $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Debug" + cd "..\mysqlmanager" + +"mysqlclient - Win32 DebugCLEAN" : + cd "\MYSQL-3.23\client" + $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Debug" RECURSE=1 CLEAN + cd "..\mysqlmanager" + +!ENDIF + + +!ENDIF + -- cgit v1.2.1