Commitde1172f

committed

Default to thread safety on, and support more CPU options. Also

make sure that a CPU option is actually chosen.Hiroshi Saito

1 parent5a0d31d commitde1172fCopy full SHA for de1172f

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,24 @@`
`6`	`6`	`# USE_KFW=1 will compile with kfw(kerberos for Windows)`
`7`	`7`	`# DEBUG=1 compiles with debugging symbols`
`8`	`8`	`# ENABLE_THREAD_SAFETY=1 compiles with threading enabled`
	`9`	`+`
	`10`	`+ENABLE_THREAD_SAFETY=1`
	`11`	`+`
`9`	`12`	`# CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)`
`10`	`13`
`11`		`-!IF "$(CPU)" == ""`
	`14`	`+!IF("$(CPU)" == "")\|\|("$(CPU)" == "i386")`
`12`	`15`	`CPU=i386`
`13`	`16`	`!MESSAGE Building the Win32 static library...`
`14`	`17`	`!MESSAGE`
`15`		`-!ELSE`
	`18`	`+!ELSEIF ("$(CPU)" == "IA64")\|\|("$(CPU)" == "AMD64")`
`16`	`19`	`ADD_DEFINES=/D "WIN64" /Wp64 /GS`
`17`	`20`	`ADD_SECLIB=bufferoverflowU.lib`
`18`	`21`	`!MESSAGE Building the Win64 static library...`
`19`	`22`	`!MESSAGE`
	`23`	`+!ELSE`
	`24`	`+!MESSAGE Please check a CPU=$(CPU) ?`
	`25`	`+!MESSAGE CPU=i386 or AMD64 or IA64`
	`26`	`+!ERROR Make aborted.`
`20`	`27`	`!ENDIF`
`21`	`28`
`22`	`29`	`!IFDEF DEBUG`

Comments

(0)