summaryrefslogtreecommitdiff
path: root/ndb/config
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-11-15 10:43:17 +0100
committerunknown <joreland@mysql.com>2004-11-15 10:43:17 +0100
commit8f145e4cbd5151155132a127434390218c0cf2e8 (patch)
treedf62a833131f8aa0dc80467be9a0ec6045d85c4b /ndb/config
parentc63ae27eb81b7a55d8c941b0e38efdafc5833db5 (diff)
downloadmariadb-git-8f145e4cbd5151155132a127434390218c0cf2e8.tar.gz
wl1744 - ndb on windows
ndb/config/win-lib.am: removed TLS stuff (which I don't know what it is) ndb/include/kernel/signaldata/UtilLock.hpp: Made stuff public ndb/include/ndb_global.h.in: better defines for strcasecmp ndb/src/common/transporter/Transporter.cpp: Use NDB_INVALID_SOCKET ndb/src/common/util/SocketClient.cpp: Use NDB_INVALID_SOCKET ndb/src/kernel/vm/Callback.hpp: Move callback into SimulatedBlock as it for some mysterious reason otherwise got sizeof()=0 on windows ndb/src/kernel/vm/Configuration.cpp: Removed extra (bug) semi-colon ndb/src/kernel/vm/Mutex.cpp: Move callback into SimulatedBlock as it for some mysterious reason otherwise got sizeof()=0 on windows ndb/src/kernel/vm/Mutex.hpp: Move callback into SimulatedBlock as it for some mysterious reason otherwise got sizeof()=0 on windows ndb/src/kernel/vm/SectionReader.cpp: Use correct struct-type ndb/src/kernel/vm/SectionReader.hpp: Use correct struct-type ndb/src/kernel/vm/SimulatedBlock.cpp: Move callback into SimulatedBlock as it for some mysterious reason otherwise got sizeof()=0 on windows ndb/src/kernel/vm/SimulatedBlock.hpp: Move callback into SimulatedBlock as it for some mysterious reason otherwise got sizeof()=0 on windows ndb/src/mgmclient/Makefile.am: Add mgm client to windoze ndb/test/src/Makefile.am: Fix lib
Diffstat (limited to 'ndb/config')
-rw-r--r--ndb/config/win-lib.am63
1 files changed, 2 insertions, 61 deletions
diff --git a/ndb/config/win-lib.am b/ndb/config/win-lib.am
index cae10b9e8d0..05ac1ec8a40 100644
--- a/ndb/config/win-lib.am
+++ b/ndb/config/win-lib.am
@@ -19,8 +19,6 @@ CFG=@name@ - Win32 Debug
!MESSAGE
!MESSAGE "@name@ - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "@name@ - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "@name@ - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")
-!MESSAGE "@name@ - Win32 TLS" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -54,7 +52,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib_release\@name@.lib"
+# ADD LIB32 /nologo /out:".\lib_release\@name@.lib"
@release_libs@
!ELSEIF "$(CFG)" == "@name@ - Win32 Debug"
@@ -81,72 +79,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib_debug\@name@.lib"
+# ADD LIB32 /nologo /out:".\lib_debug\@name@.lib"
@debug_libs@
-!ELSEIF "$(CFG)" == "@name@ - Win32 TLS_DEBUG"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "@name@___Win32_TLS_DEBUG"
-# PROP BASE Intermediate_Dir "@name@___Win32_TLS_DEBUG"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "@name@___Win32_TLS_DEBUG"
-# PROP Intermediate_Dir "@name@___Win32_TLS_DEBUG"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c
-# ADD BASE CPP @includes@
-# ADD CPP @includes@
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib_debug\@name@_tls.lib"
-# ADD LIB32 /nologo /out:"..\lib_debug\@name@_tls.lib"
-@tls_debug_libs@
-
-!ELSEIF "$(CFG)" == "@name@ - Win32 TLS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "@name@___Win32_TLS"
-# PROP BASE Intermediate_Dir "@name@___Win32_TLS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "@name@___Win32_TLS"
-# PROP Intermediate_Dir "@name@___Win32_TLS"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
-# ADD BASE CPP @includes@
-# ADD CPP @includes@
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib_release\@name@_tls.lib"
-# ADD LIB32 /nologo /out:"..\lib_release\@name@_tls.lib"
-@tls_release_libs@
-
!ENDIF
# Begin Target
# Name "@name@ - Win32 Release"
# Name "@name@ - Win32 Debug"
-# Name "@name@ - Win32 TLS_DEBUG"
-# Name "@name@ - Win32 TLS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"