summaryrefslogtreecommitdiff
path: root/VC++Files/test1
diff options
context:
space:
mode:
authorunknown <georg@lmy002.wdf.sap.corp>2005-03-07 13:04:05 +0100
committerunknown <georg@lmy002.wdf.sap.corp>2005-03-07 13:04:05 +0100
commita2bad73fdd0a7a91336bc601b4424f00059a2674 (patch)
tree3f84cc5e37467aee29315a327c6e1f2dc51394ac /VC++Files/test1
parent52d19cbd7c36559622e6115ebde287f10adb4bb7 (diff)
downloadmariadb-git-a2bad73fdd0a7a91336bc601b4424f00059a2674.tar.gz
Various fixes for Windows 2003 Platform SDK SP1 beta
VC++Files/client/mysqladmin_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/client/mysqldump_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/client/mysqlimport_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/client/mysqlshow_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/client/mysqltest_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/comp_err/comp_err_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/isamchk/isamchk_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/libmysql/libmysql_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/libmysqld/libmysqld_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/libmysqltest/myTest_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/my_print_defaults/my_print_defaults_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/myisamchk/myisamchk_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/myisamlog/myisamlog_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/myisampack/myisampack_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/mysql-test/mysql_test_run_new_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/mysql_ia64.dsw: Fixes for Platform SDK SP1 beta1 (Window IA64) Changed project order (dependency doesn't work with platform SDK) VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/mysqlcheck/mysqlcheck_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/mysqlmanager/MySqlManager_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/mysqlwatch/mysqlwatch_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/pack_isam/pack_isam_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/perror/perror_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/replace/replace_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/sql/mysqld_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/sql/mysqldmax_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/strings/strings_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/test1/test1_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/tests/mysql_client_test_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64) VC++Files/thr_test/thr_test_ia64.dsp: Fixes for Platform SDK SP1 beta1 (Window IA64)
Diffstat (limited to 'VC++Files/test1')
-rw-r--r--VC++Files/test1/test1_ia64.dsp13
1 files changed, 7 insertions, 6 deletions
diff --git a/VC++Files/test1/test1_ia64.dsp b/VC++Files/test1/test1_ia64.dsp
index 2cb5dde46b5..6e283ac0224 100644
--- a/VC++Files/test1/test1_ia64.dsp
+++ b/VC++Files/test1/test1_ia64.dsp
@@ -8,12 +8,12 @@ CFG=test1 - WinIA64 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "test1.mak".
+!MESSAGE NMAKE /f "test1_ia64.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "test1.mak" CFG="test1 - WinIA64 Debug"
+!MESSAGE NMAKE /f "test1_ia64.mak" CFG="test1 - WinIA64 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
+# ADD LINK32 ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /machine:IA64
!ELSEIF "$(CFG)" == "test1 - WinIA64 Debug"
@@ -77,8 +77,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64
-# ADD LINK32 libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug -machineÖIA64 /libpath:"..\lib_debug" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64
+# ADD LINK32 libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug /libpath:"..\lib_debug" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
!ENDIF