1.1 --- a/make/windows/makefiles/compile.make Wed Feb 22 10:32:29 2012 -0800
1.2 +++ b/make/windows/makefiles/compile.make Wed Feb 22 09:24:35 2012 +0100
1.3 @@ -23,7 +23,9 @@
1.4 #
1.5
1.6 # Generic compiler settings
1.7 +!if "x$(CXX)" == "x"
1.8 CXX=cl.exe
1.9 +!endif
1.10
1.11 # CXX Flags: (these vary slightly from VC6->VS2003->VS2005 compilers)
1.12 # /nologo Supress copyright message at every cl.exe startup
1.13 @@ -183,8 +185,10 @@
1.14 LD_FLAGS = /manifest $(LD_FLAGS) $(BUFFEROVERFLOWLIB)
1.15 # Manifest Tool - used in VS2005 and later to adjust manifests stored
1.16 # as resources inside build artifacts.
1.17 +!if "x$(MT)" == "x"
1.18 MT=mt.exe
1.19 !endif
1.20 +!endif
1.21
1.22 !if "$(COMPILER_NAME)" == "VS2008"
1.23 PRODUCT_OPT_OPTION = /O2 /Oy-
1.24 @@ -194,8 +198,10 @@
1.25 LD_FLAGS = /manifest $(LD_FLAGS)
1.26 # Manifest Tool - used in VS2005 and later to adjust manifests stored
1.27 # as resources inside build artifacts.
1.28 +!if "x$(MT)" == "x"
1.29 MT=mt.exe
1.30 !endif
1.31 +!endif
1.32
1.33 !if "$(COMPILER_NAME)" == "VS2010"
1.34 PRODUCT_OPT_OPTION = /O2 /Oy-
1.35 @@ -205,7 +211,9 @@
1.36 LD_FLAGS = /manifest $(LD_FLAGS)
1.37 # Manifest Tool - used in VS2005 and later to adjust manifests stored
1.38 # as resources inside build artifacts.
1.39 +!if "x$(MT)" == "x"
1.40 MT=mt.exe
1.41 +!endif
1.42 !if "$(BUILDARCH)" == "i486"
1.43 LD_FLAGS = /SAFESEH $(LD_FLAGS)
1.44 !endif
1.45 @@ -225,7 +233,9 @@
1.46 !endif
1.47
1.48 # Generic linker settings
1.49 +!if "x$(LD)" == "x"
1.50 LD=link.exe
1.51 +!endif
1.52 LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \
1.53 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
1.54 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \
1.55 @@ -237,7 +247,9 @@
1.56 !endif
1.57
1.58 # Resource compiler settings
1.59 +!if "x$(RC)" == "x"
1.60 RC=rc.exe
1.61 +!endif
1.62 RC_FLAGS=/D "HS_VER=$(HS_VER)" \
1.63 /D "HS_DOTVER=$(HS_DOTVER)" \
1.64 /D "HS_BUILD_ID=$(HS_BUILD_ID)" \
