diff options
| author | monty@mysql.com <> | 2004-05-20 00:54:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-20 00:54:52 +0300 |
| commit | a4b0ec1eded00350f41b26c475f45fe4919924c9 (patch) | |
| tree | 969ae655143f6308b50b399e6abcb73c20e39a81 /VC++Files/myisammrg | |
| parent | 332f124bc62d2a63cfb566b50e2784c357ef6b8e (diff) | |
| parent | 8e2ff7d13546e90eed7e3d05ad7f6a8d047ecdad (diff) | |
| download | mariadb-git-a4b0ec1eded00350f41b26c475f45fe4919924c9.tar.gz | |
Merge with 4.0, mainly to get changes to windows project files
Diffstat (limited to 'VC++Files/myisammrg')
| -rw-r--r-- | VC++Files/myisammrg/myisammrg.dsp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/VC++Files/myisammrg/myisammrg.dsp b/VC++Files/myisammrg/myisammrg.dsp index b7b613b1542..909f24f81e9 100644 --- a/VC++Files/myisammrg/myisammrg.dsp +++ b/VC++Files/myisammrg/myisammrg.dsp @@ -25,7 +25,7 @@ CFG=myisammrg - Win32 Debug # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe +CPP=xicl6.exe RSC=rc.exe !IF "$(CFG)" == "myisammrg - Win32 Release" @@ -41,13 +41,13 @@ 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 "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /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 # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LIB32=link.exe -lib +LIB32=xilink6.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib_release\myisammrg.lib" @@ -71,7 +71,7 @@ LIB32=link.exe -lib BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LIB32=link.exe -lib +LIB32=xilink6.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg.lib" |