diff options
author | unknown <joerg@mysql.com> | 2005-07-21 21:47:46 +0200 |
---|---|---|
committer | unknown <joerg@mysql.com> | 2005-07-21 21:47:46 +0200 |
commit | 26ba52480347c43db5f47e8128d3b9fdb2ab7929 (patch) | |
tree | 0332043287b9fa8225a4eb514e885bcbf026fc04 | |
parent | 15424cb9702bfd364d97b9883503b5516c425df8 (diff) | |
download | mariadb-git-26ba52480347c43db5f47e8128d3b9fdb2ab7929.tar.gz |
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.
-rw-r--r-- | VC++Files/mysql.dsw | 10 | ||||
-rw-r--r-- | VC++Files/mysql_ia64.dsw | 8 | ||||
-rw-r--r-- | VC++Files/sql/mysqld.dsp | 10 | ||||
-rw-r--r-- | VC++Files/storage/bdb/bdb.dsp (renamed from VC++Files/bdb/bdb.dsp) | 6 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw (renamed from VC++Files/bdb/build_win32/Berkeley_DB.dsw) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_archive.dsp (renamed from VC++Files/bdb/build_win32/db_archive.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_buildall.dsp (renamed from VC++Files/bdb/build_win32/db_buildall.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_checkpoint.dsp (renamed from VC++Files/bdb/build_win32/db_checkpoint.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_deadlock.dsp (renamed from VC++Files/bdb/build_win32/db_deadlock.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_dll.dsp (renamed from VC++Files/bdb/build_win32/db_dll.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_dump.dsp (renamed from VC++Files/bdb/build_win32/db_dump.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_java.dsp (renamed from VC++Files/bdb/build_win32/db_java.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_load.dsp (renamed from VC++Files/bdb/build_win32/db_load.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_printlog.dsp (renamed from VC++Files/bdb/build_win32/db_printlog.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_recover.dsp (renamed from VC++Files/bdb/build_win32/db_recover.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_stat.dsp (renamed from VC++Files/bdb/build_win32/db_stat.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_static.dsp (renamed from VC++Files/bdb/build_win32/db_static.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_static1.dsp (renamed from VC++Files/bdb/build_win32/db_static1.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_tcl.dsp (renamed from VC++Files/bdb/build_win32/db_tcl.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_test.dsp (renamed from VC++Files/bdb/build_win32/db_test.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_upgrade.dsp (renamed from VC++Files/bdb/build_win32/db_upgrade.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/db_verify.dsp (renamed from VC++Files/bdb/build_win32/db_verify.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/ex_access.dsp (renamed from VC++Files/bdb/build_win32/ex_access.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/ex_btrec.dsp (renamed from VC++Files/bdb/build_win32/ex_btrec.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/ex_env.dsp (renamed from VC++Files/bdb/build_win32/ex_env.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/ex_lock.dsp (renamed from VC++Files/bdb/build_win32/ex_lock.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/ex_mpool.dsp (renamed from VC++Files/bdb/build_win32/ex_mpool.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/ex_tpcb.dsp (renamed from VC++Files/bdb/build_win32/ex_tpcb.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/excxx_access.dsp (renamed from VC++Files/bdb/build_win32/excxx_access.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/excxx_btrec.dsp (renamed from VC++Files/bdb/build_win32/excxx_btrec.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/excxx_env.dsp (renamed from VC++Files/bdb/build_win32/excxx_env.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/excxx_lock.dsp (renamed from VC++Files/bdb/build_win32/excxx_lock.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/excxx_mpool.dsp (renamed from VC++Files/bdb/build_win32/excxx_mpool.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp (renamed from VC++Files/bdb/build_win32/excxx_tpcb.dsp) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/libdb.def (renamed from VC++Files/bdb/build_win32/libdb.def) | 0 | ||||
-rw-r--r-- | VC++Files/storage/bdb/build_win32/libdb_tcl.def (renamed from VC++Files/bdb/build_win32/libdb_tcl.def) | 0 | ||||
-rw-r--r-- | VC++Files/storage/heap/heap.dsp (renamed from VC++Files/heap/heap.dsp) | 24 | ||||
-rw-r--r-- | VC++Files/storage/heap/heap_ia64.dsp (renamed from VC++Files/heap/heap_ia64.dsp) | 24 | ||||
-rw-r--r-- | VC++Files/storage/innobase/innobase.dsp (renamed from VC++Files/innobase/innobase.dsp) | 30 | ||||
-rw-r--r-- | VC++Files/storage/innobase/innobase_ia64.dsp (renamed from VC++Files/innobase/innobase_ia64.dsp) | 30 | ||||
-rw-r--r-- | VC++Files/storage/myisam/myisam.dsp (renamed from VC++Files/myisam/myisam.dsp) | 24 | ||||
-rw-r--r-- | VC++Files/storage/myisam/myisam_ia64.dsp (renamed from VC++Files/myisam/myisam_ia64.dsp) | 24 | ||||
-rw-r--r-- | VC++Files/storage/myisammrg/myisammrg.dsp (renamed from VC++Files/myisammrg/myisammrg.dsp) | 24 | ||||
-rw-r--r-- | VC++Files/storage/myisammrg/myisammrg_ia64.dsp (renamed from VC++Files/myisammrg/myisammrg_ia64.dsp) | 24 | ||||
-rw-r--r-- | scripts/make_win_src_distribution.sh | 18 |
45 files changed, 126 insertions, 130 deletions
diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw index b1d09552705..36e3e1ae10c 100644 --- a/VC++Files/mysql.dsw +++ b/VC++Files/mysql.dsw @@ -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> {{{ diff --git a/VC++Files/mysql_ia64.dsw b/VC++Files/mysql_ia64.dsw index 3b588deee61..1e441107c93 100644 --- a/VC++Files/mysql_ia64.dsw +++ b/VC++Files/mysql_ia64.dsw @@ -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> {{{ diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index e8f24b300cb..e2832c98434 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -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" diff --git a/VC++Files/bdb/bdb.dsp b/VC++Files/storage/bdb/bdb.dsp index bd0e644bc2e..404463596cd 100644 --- a/VC++Files/bdb/bdb.dsp +++ b/VC++Files/storage/bdb/bdb.dsp @@ -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 diff --git a/VC++Files/bdb/build_win32/Berkeley_DB.dsw b/VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw index 899e31ad58d..899e31ad58d 100644 --- a/VC++Files/bdb/build_win32/Berkeley_DB.dsw +++ b/VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw diff --git a/VC++Files/bdb/build_win32/db_archive.dsp b/VC++Files/storage/bdb/build_win32/db_archive.dsp index b115caba486..b115caba486 100644 --- a/VC++Files/bdb/build_win32/db_archive.dsp +++ b/VC++Files/storage/bdb/build_win32/db_archive.dsp diff --git a/VC++Files/bdb/build_win32/db_buildall.dsp b/VC++Files/storage/bdb/build_win32/db_buildall.dsp index 1f54083d00f..1f54083d00f 100644 --- a/VC++Files/bdb/build_win32/db_buildall.dsp +++ b/VC++Files/storage/bdb/build_win32/db_buildall.dsp diff --git a/VC++Files/bdb/build_win32/db_checkpoint.dsp b/VC++Files/storage/bdb/build_win32/db_checkpoint.dsp index 71ee57e1693..71ee57e1693 100644 --- a/VC++Files/bdb/build_win32/db_checkpoint.dsp +++ b/VC++Files/storage/bdb/build_win32/db_checkpoint.dsp diff --git a/VC++Files/bdb/build_win32/db_deadlock.dsp b/VC++Files/storage/bdb/build_win32/db_deadlock.dsp index d9112bace47..d9112bace47 100644 --- a/VC++Files/bdb/build_win32/db_deadlock.dsp +++ b/VC++Files/storage/bdb/build_win32/db_deadlock.dsp diff --git a/VC++Files/bdb/build_win32/db_dll.dsp b/VC++Files/storage/bdb/build_win32/db_dll.dsp index 3ec370c1d72..3ec370c1d72 100644 --- a/VC++Files/bdb/build_win32/db_dll.dsp +++ b/VC++Files/storage/bdb/build_win32/db_dll.dsp diff --git a/VC++Files/bdb/build_win32/db_dump.dsp b/VC++Files/storage/bdb/build_win32/db_dump.dsp index dbc183166a4..dbc183166a4 100644 --- a/VC++Files/bdb/build_win32/db_dump.dsp +++ b/VC++Files/storage/bdb/build_win32/db_dump.dsp diff --git a/VC++Files/bdb/build_win32/db_java.dsp b/VC++Files/storage/bdb/build_win32/db_java.dsp index 5866d355259..5866d355259 100644 --- a/VC++Files/bdb/build_win32/db_java.dsp +++ b/VC++Files/storage/bdb/build_win32/db_java.dsp diff --git a/VC++Files/bdb/build_win32/db_load.dsp b/VC++Files/storage/bdb/build_win32/db_load.dsp index ddd516e67fd..ddd516e67fd 100644 --- a/VC++Files/bdb/build_win32/db_load.dsp +++ b/VC++Files/storage/bdb/build_win32/db_load.dsp diff --git a/VC++Files/bdb/build_win32/db_printlog.dsp b/VC++Files/storage/bdb/build_win32/db_printlog.dsp index 4e19ff7344a..4e19ff7344a 100644 --- a/VC++Files/bdb/build_win32/db_printlog.dsp +++ b/VC++Files/storage/bdb/build_win32/db_printlog.dsp diff --git a/VC++Files/bdb/build_win32/db_recover.dsp b/VC++Files/storage/bdb/build_win32/db_recover.dsp index 6419c3faf64..6419c3faf64 100644 --- a/VC++Files/bdb/build_win32/db_recover.dsp +++ b/VC++Files/storage/bdb/build_win32/db_recover.dsp diff --git a/VC++Files/bdb/build_win32/db_stat.dsp b/VC++Files/storage/bdb/build_win32/db_stat.dsp index 8cf59197d42..8cf59197d42 100644 --- a/VC++Files/bdb/build_win32/db_stat.dsp +++ b/VC++Files/storage/bdb/build_win32/db_stat.dsp diff --git a/VC++Files/bdb/build_win32/db_static.dsp b/VC++Files/storage/bdb/build_win32/db_static.dsp index 5a95bf7b1c6..5a95bf7b1c6 100644 --- a/VC++Files/bdb/build_win32/db_static.dsp +++ b/VC++Files/storage/bdb/build_win32/db_static.dsp diff --git a/VC++Files/bdb/build_win32/db_static1.dsp b/VC++Files/storage/bdb/build_win32/db_static1.dsp index 15498e58ca5..15498e58ca5 100644 --- a/VC++Files/bdb/build_win32/db_static1.dsp +++ b/VC++Files/storage/bdb/build_win32/db_static1.dsp diff --git a/VC++Files/bdb/build_win32/db_tcl.dsp b/VC++Files/storage/bdb/build_win32/db_tcl.dsp index ae2e1a38e9b..ae2e1a38e9b 100644 --- a/VC++Files/bdb/build_win32/db_tcl.dsp +++ b/VC++Files/storage/bdb/build_win32/db_tcl.dsp diff --git a/VC++Files/bdb/build_win32/db_test.dsp b/VC++Files/storage/bdb/build_win32/db_test.dsp index 406a1369696..406a1369696 100644 --- a/VC++Files/bdb/build_win32/db_test.dsp +++ b/VC++Files/storage/bdb/build_win32/db_test.dsp diff --git a/VC++Files/bdb/build_win32/db_upgrade.dsp b/VC++Files/storage/bdb/build_win32/db_upgrade.dsp index c2f3a748a61..c2f3a748a61 100644 --- a/VC++Files/bdb/build_win32/db_upgrade.dsp +++ b/VC++Files/storage/bdb/build_win32/db_upgrade.dsp diff --git a/VC++Files/bdb/build_win32/db_verify.dsp b/VC++Files/storage/bdb/build_win32/db_verify.dsp index b76bd203b44..b76bd203b44 100644 --- a/VC++Files/bdb/build_win32/db_verify.dsp +++ b/VC++Files/storage/bdb/build_win32/db_verify.dsp diff --git a/VC++Files/bdb/build_win32/ex_access.dsp b/VC++Files/storage/bdb/build_win32/ex_access.dsp index 5c1615c915a..5c1615c915a 100644 --- a/VC++Files/bdb/build_win32/ex_access.dsp +++ b/VC++Files/storage/bdb/build_win32/ex_access.dsp diff --git a/VC++Files/bdb/build_win32/ex_btrec.dsp b/VC++Files/storage/bdb/build_win32/ex_btrec.dsp index e687324d813..e687324d813 100644 --- a/VC++Files/bdb/build_win32/ex_btrec.dsp +++ b/VC++Files/storage/bdb/build_win32/ex_btrec.dsp diff --git a/VC++Files/bdb/build_win32/ex_env.dsp b/VC++Files/storage/bdb/build_win32/ex_env.dsp index ade4c87d965..ade4c87d965 100644 --- a/VC++Files/bdb/build_win32/ex_env.dsp +++ b/VC++Files/storage/bdb/build_win32/ex_env.dsp diff --git a/VC++Files/bdb/build_win32/ex_lock.dsp b/VC++Files/storage/bdb/build_win32/ex_lock.dsp index ce5ecc22b56..ce5ecc22b56 100644 --- a/VC++Files/bdb/build_win32/ex_lock.dsp +++ b/VC++Files/storage/bdb/build_win32/ex_lock.dsp diff --git a/VC++Files/bdb/build_win32/ex_mpool.dsp b/VC++Files/storage/bdb/build_win32/ex_mpool.dsp index f6ae1df52dc..f6ae1df52dc 100644 --- a/VC++Files/bdb/build_win32/ex_mpool.dsp +++ b/VC++Files/storage/bdb/build_win32/ex_mpool.dsp diff --git a/VC++Files/bdb/build_win32/ex_tpcb.dsp b/VC++Files/storage/bdb/build_win32/ex_tpcb.dsp index 43f7a560915..43f7a560915 100644 --- a/VC++Files/bdb/build_win32/ex_tpcb.dsp +++ b/VC++Files/storage/bdb/build_win32/ex_tpcb.dsp diff --git a/VC++Files/bdb/build_win32/excxx_access.dsp b/VC++Files/storage/bdb/build_win32/excxx_access.dsp index f817b791627..f817b791627 100644 --- a/VC++Files/bdb/build_win32/excxx_access.dsp +++ b/VC++Files/storage/bdb/build_win32/excxx_access.dsp diff --git a/VC++Files/bdb/build_win32/excxx_btrec.dsp b/VC++Files/storage/bdb/build_win32/excxx_btrec.dsp index a06904f2160..a06904f2160 100644 --- a/VC++Files/bdb/build_win32/excxx_btrec.dsp +++ b/VC++Files/storage/bdb/build_win32/excxx_btrec.dsp diff --git a/VC++Files/bdb/build_win32/excxx_env.dsp b/VC++Files/storage/bdb/build_win32/excxx_env.dsp index 5f1b1c0a2e4..5f1b1c0a2e4 100644 --- a/VC++Files/bdb/build_win32/excxx_env.dsp +++ b/VC++Files/storage/bdb/build_win32/excxx_env.dsp diff --git a/VC++Files/bdb/build_win32/excxx_lock.dsp b/VC++Files/storage/bdb/build_win32/excxx_lock.dsp index 5fe931537a9..5fe931537a9 100644 --- a/VC++Files/bdb/build_win32/excxx_lock.dsp +++ b/VC++Files/storage/bdb/build_win32/excxx_lock.dsp diff --git a/VC++Files/bdb/build_win32/excxx_mpool.dsp b/VC++Files/storage/bdb/build_win32/excxx_mpool.dsp index 213202b1726..213202b1726 100644 --- a/VC++Files/bdb/build_win32/excxx_mpool.dsp +++ b/VC++Files/storage/bdb/build_win32/excxx_mpool.dsp diff --git a/VC++Files/bdb/build_win32/excxx_tpcb.dsp b/VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp index ef89fc0de87..ef89fc0de87 100644 --- a/VC++Files/bdb/build_win32/excxx_tpcb.dsp +++ b/VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp diff --git a/VC++Files/bdb/build_win32/libdb.def b/VC++Files/storage/bdb/build_win32/libdb.def index a3b4cb3b26b..a3b4cb3b26b 100644 --- a/VC++Files/bdb/build_win32/libdb.def +++ b/VC++Files/storage/bdb/build_win32/libdb.def diff --git a/VC++Files/bdb/build_win32/libdb_tcl.def b/VC++Files/storage/bdb/build_win32/libdb_tcl.def index a18459beaba..a18459beaba 100644 --- a/VC++Files/bdb/build_win32/libdb_tcl.def +++ b/VC++Files/storage/bdb/build_win32/libdb_tcl.def diff --git a/VC++Files/heap/heap.dsp b/VC++Files/storage/heap/heap.dsp index 8b72560a8b6..11792c6fcc1 100644 --- a/VC++Files/heap/heap.dsp +++ b/VC++Files/storage/heap/heap.dsp @@ -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 diff --git a/VC++Files/heap/heap_ia64.dsp b/VC++Files/storage/heap/heap_ia64.dsp index 6b40b7c34b7..1cc7be280b1 100644 --- a/VC++Files/heap/heap_ia64.dsp +++ b/VC++Files/storage/heap/heap_ia64.dsp @@ -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 diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/storage/innobase/innobase.dsp index 0768b3095ea..47fcd04683a 100644 --- a/VC++Files/innobase/innobase.dsp +++ b/VC++Files/storage/innobase/innobase.dsp @@ -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 diff --git a/VC++Files/innobase/innobase_ia64.dsp b/VC++Files/storage/innobase/innobase_ia64.dsp index 3b42601186a..a16e7441c72 100644 --- a/VC++Files/innobase/innobase_ia64.dsp +++ b/VC++Files/storage/innobase/innobase_ia64.dsp @@ -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 diff --git a/VC++Files/myisam/myisam.dsp b/VC++Files/storage/myisam/myisam.dsp index 77a5315c549..f040f6ffdfc 100644 --- a/VC++Files/myisam/myisam.dsp +++ b/VC++Files/storage/myisam/myisam.dsp @@ -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 diff --git a/VC++Files/myisam/myisam_ia64.dsp b/VC++Files/storage/myisam/myisam_ia64.dsp index 3602eb87c20..e93b0b8211b 100644 --- a/VC++Files/myisam/myisam_ia64.dsp +++ b/VC++Files/storage/myisam/myisam_ia64.dsp @@ -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 diff --git a/VC++Files/myisammrg/myisammrg.dsp b/VC++Files/storage/myisammrg/myisammrg.dsp index 419d36517c9..3aa638167d1 100644 --- a/VC++Files/myisammrg/myisammrg.dsp +++ b/VC++Files/storage/myisammrg/myisammrg.dsp @@ -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 diff --git a/VC++Files/myisammrg/myisammrg_ia64.dsp b/VC++Files/storage/myisammrg/myisammrg_ia64.dsp index 4ac6a1e8081..c759ac7febc 100644 --- a/VC++Files/myisammrg/myisammrg_ia64.dsp +++ b/VC++Files/storage/myisammrg/myisammrg_ia64.dsp @@ -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 diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index c79433f97c1..0b280217ed5 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -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 # |