mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the tools for Windows: 1) When the source package is created, there is the additional level "storage". 2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync. 3) Within the project files, references to/from the table handlers must cross that level. VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw: mvdir VC++Files/storage/bdb/build_win32/db_archive.dsp: mvdir VC++Files/storage/bdb/build_win32/db_buildall.dsp: mvdir VC++Files/storage/bdb/build_win32/db_checkpoint.dsp: mvdir VC++Files/storage/bdb/build_win32/db_deadlock.dsp: mvdir VC++Files/storage/bdb/build_win32/db_dll.dsp: mvdir VC++Files/storage/bdb/build_win32/db_dump.dsp: mvdir VC++Files/storage/bdb/build_win32/db_java.dsp: mvdir VC++Files/storage/bdb/build_win32/db_load.dsp: mvdir VC++Files/storage/bdb/build_win32/db_printlog.dsp: mvdir VC++Files/storage/bdb/build_win32/db_recover.dsp: mvdir VC++Files/storage/bdb/build_win32/db_stat.dsp: mvdir VC++Files/storage/bdb/build_win32/db_static.dsp: mvdir VC++Files/storage/bdb/build_win32/db_static1.dsp: mvdir VC++Files/storage/bdb/build_win32/db_tcl.dsp: mvdir VC++Files/storage/bdb/build_win32/db_test.dsp: mvdir VC++Files/storage/bdb/build_win32/db_upgrade.dsp: mvdir VC++Files/storage/bdb/build_win32/db_verify.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_access.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_btrec.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_env.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_lock.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_mpool.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_tpcb.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_access.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_btrec.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_env.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_lock.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_mpool.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp: mvdir VC++Files/storage/bdb/build_win32/libdb.def: mvdir VC++Files/storage/bdb/build_win32/libdb_tcl.def: mvdir VC++Files/mysql.dsw: Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the hierarchy of project files. VC++Files/mysql_ia64.dsw: Table handlers "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the hierarchy of project files. VC++Files/sql/mysqld.dsp: Table handler "bdb" has been moved into a subdirectory "storage". File "myrg_rnext_same.c" belongs to project "myisammrg". VC++Files/storage/bdb/bdb.dsp: Table handler "bdb" has been moved into a subdirectory "storage", so the path to the directories keeping the libraries must point one level higher. VC++Files/storage/heap/heap.dsp: Table handler "heap" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/heap/heap_ia64.dsp: Table handler "heap" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. scripts/make_win_src_distribution.sh: Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb" have been moved into a common subdirectory "storage". This must be reflected when creating a source package for Windows. VC++Files/storage/innobase/innobase.dsp: Table handler "innobase" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/innobase/innobase_ia64.dsp: Table handler "innobase" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisam/myisam.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisam/myisam_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisammrg/myisammrg.dsp: Table handler "myisammrg" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisammrg/myisammrg_ia64.dsp: Table handler "myisammrg" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher.
This commit is contained in:
@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "bdb"=".\bdb\bdb.dsp" - Package Owner=<4>
|
||||
Project: "bdb"=".\storage\bdb\bdb.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -45,7 +45,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "heap"=".\heap\heap.dsp" - Package Owner=<4>
|
||||
Project: "heap"=".\storage\heap\heap.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -57,7 +57,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "innobase"=".\innobase\innobase.dsp" - Package Owner=<4>
|
||||
Project: "innobase"=".\storage\innobase\innobase.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -171,7 +171,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "myisam"=".\myisam\myisam.dsp" - Package Owner=<4>
|
||||
Project: "myisam"=".\storage\myisam\myisam.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -261,7 +261,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "myisammrg"=".\myisammrg\myisammrg.dsp" - Package Owner=<4>
|
||||
Project: "myisammrg"=".\storage\myisammrg\myisammrg.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
@ -109,7 +109,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "myisam"=".\myisam\myisam_ia64.dsp" - Package Owner=<4>
|
||||
Project: "myisam"=".\storage\myisam\myisam_ia64.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -124,7 +124,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "myisammrg"=".\myisammrg\myisammrg_ia64.dsp" - Package Owner=<4>
|
||||
Project: "myisammrg"=".\storage\myisammrg\myisammrg_ia64.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -163,7 +163,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "heap"=".\heap\heap_ia64.dsp" - Package Owner=<4>
|
||||
Project: "heap"=".\storage\heap\heap_ia64.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -175,7 +175,7 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "innobase"=".\innobase\innobase_ia64.dsp" - Package Owner=<4>
|
||||
Project: "innobase"=".\storage\innobase\innobase_ia64.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
@ -75,7 +75,7 @@ LINK32=xilink6.exe
|
||||
# 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 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
|
||||
# SUBTRACT CPP /Fr /YX
|
||||
# ADD BASE RSC /l 0x410 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
@ -130,7 +130,7 @@ LINK32=xilink6.exe
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
|
||||
# SUBTRACT BASE CPP /YX
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
@ -159,7 +159,7 @@ LINK32=xilink6.exe
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
|
||||
# SUBTRACT BASE CPP /YX
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
@ -1110,10 +1110,6 @@ SOURCE=.\my_time.c
|
||||
# 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"
|
||||
|
@ -49,7 +49,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\bdb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\bdb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "bdb - Win32 Max"
|
||||
|
||||
@ -72,8 +72,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_debug\bdb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\bdb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_debug\bdb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\bdb.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# 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 "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -52,7 +52,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\heap.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\heap.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "heap - Win32 Debug"
|
||||
|
||||
@ -67,7 +67,7 @@ LIB32=xilink6.exe -lib
|
||||
# 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
|
||||
# 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
|
||||
@ -76,7 +76,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\heap.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\heap.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "heap - Win32 TLS_DEBUG"
|
||||
|
||||
@ -90,9 +90,9 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Output_Dir "heap___Win32_TLS_DEBUG"
|
||||
# PROP Intermediate_Dir "heap___Win32_TLS_DEBUG"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
|
||||
# SUBTRACT BASE CPP /YX
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -100,8 +100,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_debug\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\heap_tls.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "heap - Win32 TLS"
|
||||
|
||||
@ -115,9 +115,9 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "heap___Win32_TLS"
|
||||
# PROP Intermediate_Dir "heap___Win32_TLS"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# SUBTRACT BASE CPP /YX
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -125,8 +125,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\heap_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\heap_tls.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -52,7 +52,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\heap.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\heap.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "heap - WinIA64 Debug"
|
||||
|
||||
@ -67,7 +67,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -76,7 +76,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\heap.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\heap.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "heap - WinIA64 TLS_DEBUG"
|
||||
|
||||
@ -90,9 +90,9 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "heap___WinIA64_TLS_DEBUG"
|
||||
# PROP Intermediate_Dir "heap___WinIA64_TLS_DEBUG"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
|
||||
# SUBTRACT BASE CPP /YX
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -100,8 +100,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_debug\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\heap_tls.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "heap - WinIA64 TLS"
|
||||
|
||||
@ -115,9 +115,9 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "heap___WinIA64_TLS"
|
||||
# PROP Intermediate_Dir "heap___WinIA64_TLS"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# SUBTRACT BASE CPP /YX
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
@ -125,8 +125,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\heap_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\heap_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\heap_tls.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /Od /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /Od /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
|
||||
# SUBTRACT CPP /Fr /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -51,8 +51,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innobase-nt.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\innodb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "innobase - Win32 Release"
|
||||
|
||||
@ -66,8 +66,8 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Output_Dir "release"
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c
|
||||
# SUBTRACT CPP /WX /Fr /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -75,8 +75,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "innobase - Win32 nt"
|
||||
|
||||
@ -90,8 +90,8 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Output_Dir "nt"
|
||||
# PROP Intermediate_Dir "nt"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -99,8 +99,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "innobase - Win32 Max nt"
|
||||
|
||||
@ -114,8 +114,8 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Output_Dir "max_nt"
|
||||
# PROP Intermediate_Dir "max_nt"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -123,8 +123,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "__NT__" /D "WIN64" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /Fr /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -51,8 +51,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_debug\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innobase-nt.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_debug\innodb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "innobase - WinIA64 Release"
|
||||
|
||||
@ -66,8 +66,8 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "release"
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /WX /Fr /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -75,8 +75,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "innobase - WinIA64 nt"
|
||||
|
||||
@ -90,8 +90,8 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "nt"
|
||||
# PROP Intermediate_Dir "nt"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -99,8 +99,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "innobase - WinIA64 Max nt"
|
||||
|
||||
@ -114,8 +114,8 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "max_nt"
|
||||
# PROP Intermediate_Dir "max_nt"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_Win64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt-max /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../../include" /D "NDEBUG" /D "_LIB" /D "_Win64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt-max /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE RSC /l 0x416 /d "NDEBUG"
|
||||
# ADD RSC /l 0x416 /d "NDEBUG"
|
||||
@ -123,8 +123,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\innodb.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -51,7 +51,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisam.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisam.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisam - Win32 Debug"
|
||||
|
||||
@ -66,7 +66,7 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -74,7 +74,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisam.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisam.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisam - Win32 TLS_DEBUG"
|
||||
|
||||
@ -88,16 +88,16 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Output_Dir "myisam___Win32_TLS_DEBUG"
|
||||
# PROP Intermediate_Dir "myisam___Win32_TLS_DEBUG"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_Debug\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisam_tls.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisam - Win32 TLS"
|
||||
|
||||
@ -111,16 +111,16 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "myisam___Win32_TLS"
|
||||
# PROP Intermediate_Dir "myisam___Win32_TLS"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisam_tls.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -51,7 +51,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisam.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisam.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisam - WinIA64 Debug"
|
||||
|
||||
@ -66,7 +66,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -74,7 +74,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisam.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisam.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisam - WinIA64 TLS_DEBUG"
|
||||
|
||||
@ -88,16 +88,16 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "myisam___Win64_TLS_DEBUG"
|
||||
# PROP Intermediate_Dir "myisam___Win64_TLS_DEBUG"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_Debug\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisam_tls.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisam - WinIA64 TLS"
|
||||
|
||||
@ -111,16 +111,16 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "myisam___Win64_TLS"
|
||||
# PROP Intermediate_Dir "myisam___Win64_TLS"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\myisam_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisam_tls.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -51,7 +51,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisammrg.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisammrg.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisammrg - Win32 Debug"
|
||||
|
||||
@ -66,7 +66,7 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# SUBTRACT CPP /Fr
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
@ -75,7 +75,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=xilink6.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisammrg.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisammrg - Win32 TLS_DEBUG"
|
||||
|
||||
@ -89,9 +89,9 @@ LIB32=xilink6.exe -lib
|
||||
# PROP Output_Dir "myisammrg___Win32_TLS_DEBUG"
|
||||
# PROP Intermediate_Dir "myisammrg___Win32_TLS_DEBUG"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# SUBTRACT BASE CPP /Fr
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# SUBTRACT CPP /Fr
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
@ -99,8 +99,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_Debug\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_Debug\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisammrg_tls.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisammrg - Win32 TLS"
|
||||
|
||||
@ -114,16 +114,16 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "myisammrg___Win32_TLS"
|
||||
# PROP Intermediate_Dir "myisammrg___Win32_TLS"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisammrg_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisammrg_tls.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Intermediate_Dir "release"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WinIA64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
@ -51,7 +51,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisammrg.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisammrg.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisammrg - WinIA64 Debug"
|
||||
|
||||
@ -66,7 +66,7 @@ LIB32=link.exe -lib
|
||||
# PROP Intermediate_Dir "debug"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WinIA64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /Fr
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
@ -75,7 +75,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisammrg.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisammrg - WinIA64 TLS_DEBUG"
|
||||
|
||||
@ -89,9 +89,9 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "myisammrg___WinIA64 _TLS_DEBUG"
|
||||
# PROP Intermediate_Dir "myisammrg___WinIA64 _TLS_DEBUG"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
|
||||
# SUBTRACT BASE CPP /Fr
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# SUBTRACT CPP /Fr
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
@ -99,8 +99,8 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_Debug\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_Debug\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_Debug\myisammrg_tls.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "myisammrg - WinIA64 TLS"
|
||||
|
||||
@ -114,16 +114,16 @@ LIB32=link.exe -lib
|
||||
# PROP Output_Dir "myisammrg___WinIA64 _TLS"
|
||||
# PROP Intermediate_Dir "myisammrg___WinIA64 _TLS"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\lib_release\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\lib_release\myisammrg_tls.lib"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib_release\myisammrg_tls.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib_release\myisammrg_tls.lib"
|
||||
|
||||
!ENDIF
|
||||
|
@ -184,7 +184,7 @@ rm -r -f "$BASE/share/Makefile"
|
||||
rm -r -f "$BASE/share/Makefile.in"
|
||||
rm -r -f "$BASE/share/Makefile.am"
|
||||
|
||||
mkdir $BASE/Docs $BASE/extra $BASE/include
|
||||
mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
|
||||
|
||||
#
|
||||
# Copy directory files
|
||||
@ -249,9 +249,9 @@ copy_dir_dirs() {
|
||||
# Input directories to be copied
|
||||
#
|
||||
|
||||
for i in client dbug extra heap include \
|
||||
libmysql libmysqld myisam \
|
||||
myisammrg mysys regex sql strings sql-common sql/examples \
|
||||
for i in client dbug extra storage/heap include \
|
||||
libmysql libmysqld storage/myisam \
|
||||
storage/myisammrg mysys regex sql strings sql-common sql/examples \
|
||||
tools vio zlib
|
||||
do
|
||||
copy_dir_files $i
|
||||
@ -260,13 +260,13 @@ done
|
||||
#
|
||||
# Create project files for ndb
|
||||
#
|
||||
make -C $SOURCE/ndb windoze
|
||||
make -C $SOURCE/storage/ndb windoze
|
||||
|
||||
#
|
||||
# Input directories to be copied recursively
|
||||
#
|
||||
|
||||
for i in bdb innobase ndb extra/yassl
|
||||
for i in storage/bdb storage/innobase storage/ndb extra/yassl
|
||||
do
|
||||
copy_dir_dirs $i
|
||||
done
|
||||
@ -275,10 +275,10 @@ done
|
||||
# Create dummy innobase configure header
|
||||
#
|
||||
|
||||
if [ -f $BASE/innobase/ib_config.h ]; then
|
||||
rm -f $BASE/innobase/ib_config.h
|
||||
if [ -f $BASE/storage/innobase/ib_config.h ]; then
|
||||
rm -f $BASE/storage/innobase/ib_config.h
|
||||
fi
|
||||
touch $BASE/innobase/ib_config.h
|
||||
touch $BASE/storage/innobase/ib_config.h
|
||||
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user