diff options
| author | Magnus Hagander | 2007-10-02 19:01:45 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2007-10-02 19:01:45 +0000 |
| commit | 87bb261d419690f83ed78d9fc6ab586f011d4652 (patch) | |
| tree | 7026e3d6ccdb68dd4ddc22a20f1e7713376df6ce | |
| parent | 5329cd2ba26b7f7544ce0757e5242f6043fd9857 (diff) | |
Default to thread safety on, and support more CPU options. Also
make sure that a CPU option is actually chosen.
Hiroshi Saito
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index b5f825626d..6a6df50ae3 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -6,17 +6,24 @@ # USE_KFW=1 will compile with kfw(kerberos for Windows) # DEBUG=1 compiles with debugging symbols # ENABLE_THREAD_SAFETY=1 compiles with threading enabled + +ENABLE_THREAD_SAFETY=1 + # CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64) -!IF "$(CPU)" == "" +!IF ("$(CPU)" == "")||("$(CPU)" == "i386") CPU=i386 !MESSAGE Building the Win32 static library... !MESSAGE -!ELSE +!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64") ADD_DEFINES=/D "WIN64" /Wp64 /GS ADD_SECLIB=bufferoverflowU.lib !MESSAGE Building the Win64 static library... !MESSAGE +!ELSE +!MESSAGE Please check a CPU=$(CPU) ? +!MESSAGE CPU=i386 or AMD64 or IA64 +!ERROR Make aborted. !ENDIF !IFDEF DEBUG |