summaryrefslogtreecommitdiff
path: root/VC++Files/test1
diff options
context:
space:
mode:
authorgeorg@lmy002.wdf.sap.corp <>2005-03-07 13:04:05 +0100
committergeorg@lmy002.wdf.sap.corp <>2005-03-07 13:04:05 +0100
commite8e5cd50535b783c526822e75828a0f1a34670fc (patch)
tree3f84cc5e37467aee29315a327c6e1f2dc51394ac /VC++Files/test1
parent877b2f468847e08fdc58be614a24d4e4e900c88a (diff)
downloadmariadb-git-e8e5cd50535b783c526822e75828a0f1a34670fc.tar.gz
Various fixes for Windows 2003 Platform SDK SP1 beta
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