diff options
author | monty@mysql.com <> | 2004-05-25 22:54:00 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-05-25 22:54:00 +0300 |
commit | 390d9898f9adb21c9794b8161749d8e3fcab7820 (patch) | |
tree | b258dbd41e0b45f70adf8c42ee94cce74cd0232f /VC++Files/myisam | |
parent | 96b6f0a68661a62ba4c92620dac457ad39fc6f0d (diff) | |
parent | 2397f7081af8d5b42b6ec124e68e5279dae2f05a (diff) | |
download | mariadb-git-390d9898f9adb21c9794b8161749d8e3fcab7820.tar.gz |
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
Diffstat (limited to 'VC++Files/myisam')
-rw-r--r-- | VC++Files/myisam/myisam.dsp | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/VC++Files/myisam/myisam.dsp b/VC++Files/myisam/myisam.dsp index 14d0fa416bc..77a5315c549 100644 --- a/VC++Files/myisam/myisam.dsp +++ b/VC++Files/myisam/myisam.dsp @@ -19,6 +19,8 @@ CFG=myisam - Win32 Debug !MESSAGE !MESSAGE "myisam - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "myisam - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "myisam - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library") +!MESSAGE "myisam - Win32 TLS" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -74,12 +76,60 @@ LIB32=xilink6.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib_Debug\myisam.lib" +!ELSEIF "$(CFG)" == "myisam - Win32 TLS_DEBUG" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "myisam___Win32_TLS_DEBUG" +# PROP BASE Intermediate_Dir "myisam___Win32_TLS_DEBUG" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# 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 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" + +!ELSEIF "$(CFG)" == "myisam - Win32 TLS" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "myisam___Win32_TLS" +# PROP BASE Intermediate_Dir "myisam___Win32_TLS" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# 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 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" + !ENDIF # Begin Target # Name "myisam - Win32 Release" # Name "myisam - Win32 Debug" +# Name "myisam - Win32 TLS_DEBUG" +# Name "myisam - Win32 TLS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |