mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

64-bit windows build just about working

Browse Source
This commit is contained in:
Eliot Horowitz 2009-07-27 13:50:25 -04:00
parent fbe8c8373f
commit 3cc17c8c5f
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
SConstruct
View File

@ -377,8 +377,10 @@ elif "freebsd7" == os.sys.platform:
elif "win32" == os.sys.platform: elif "win32" == os.sys.platform:
windows = True windows = True
if force64:
for bv in range(3,10): release = True
for bv in reversed( range(3,10) ):
boostDir = "C:/Program Files/Boost/boost_1_3" + str(bv) + "_0" boostDir = "C:/Program Files/Boost/boost_1_3" + str(bv) + "_0"
if os.path.exists( boostDir ): if os.path.exists( boostDir ):
break break
@ -425,8 +427,7 @@ elif "win32" == os.sys.platform:
env.Append( LIBPATH=[ boostDir + "/Lib" ] ) env.Append( LIBPATH=[ boostDir + "/Lib" ] )
if force64: if force64:
env.Append( LIBPATH=[ winSDKHome + "/Lib/x64" ] ) env.Append( LIBPATH=[ winSDKHome + "/Lib/x64" ] )
env.Append( LINKFLAGS=" /NODEFAULTLIB:MSVCRT " ) env.Append( LINKFLAGS=" /NODEFAULTLIB:MSVCPRT /NODEFAULTLIB:MSVCRT " )
env.Append( LINKFLAGS=" /NODEFAULTLIB:MSVPRT " )
else: else:
env.Append( LIBPATH=[ winSDKHome + "/Lib" ] ) env.Append( LIBPATH=[ winSDKHome + "/Lib" ] )
@ -451,10 +452,12 @@ elif "win32" == os.sys.platform:
commonFiles += pcreFiles commonFiles += pcreFiles
allClientFiles += pcreFiles allClientFiles += pcreFiles
winLibString = "ws2_32.lib kernel32.lib uuid.lib " winLibString = "ws2_32.lib kernel32.lib advapi32.lib"
if not force64: if force64:
winLibString += " user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib " winLibString += " LIBCMT LIBCPMT "
winLibString += " odbc32.lib odbccp32.lib" else:
winLibString += " user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib "
winLibString += " odbc32.lib odbccp32.lib uuid.lib "
env.Append( LIBS=Split(winLibString) ) env.Append( LIBS=Split(winLibString) )
if force64: if force64:
@ -814,9 +817,9 @@ if release and ( ( darwin and force64 ) or linux64 ):
if noshell: if noshell:
print( "not building shell" ) print( "not building shell" )
elif not onlyServer: elif not onlyServer:
weird = force64 weird = force64 and not windows
if force64: if weird:
shellEnv["CFLAGS"].remove("-m64") shellEnv["CFLAGS"].remove("-m64")
shellEnv["CXXFLAGS"].remove("-m64") shellEnv["CXXFLAGS"].remove("-m64")
shellEnv["LINKFLAGS"].remove("-m64") shellEnv["LINKFLAGS"].remove("-m64")

2
util/file.h
View File

@ -8,6 +8,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#else
#include <windows.h>
#endif #endif
namespace mongo { namespace mongo {

1
util/mmap_win.cpp
View File

@ -19,6 +19,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "mmap.h" #include "mmap.h"
#include <windows.h>
namespace mongo { namespace mongo {

1
util/ntservice.h
View File

@ -19,6 +19,7 @@
#pragma once #pragma once
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h>
namespace mongo { namespace mongo {

8
util/sock.h
View File

@ -24,11 +24,15 @@
#include <sstream> #include <sstream>
#include "goodies.h" #include "goodies.h"
#ifdef _WIN32
#include <windows.h>
#include <winsock.h>
#endif
namespace mongo { namespace mongo {
#if defined(_WIN32) #if defined(_WIN32)
//#include <winsock2.h>
//#include <ws2tcpip.h>
typedef int socklen_t; typedef int socklen_t;
inline int getLastError() { inline int getLastError() {
return WSAGetLastError(); return WSAGetLastError();