Mercurial > hg > truffle
comparison make/windows/makefiles/compile.make @ 21824:f3ffb37f88a6
Merge
author | asaha |
---|---|
date | Mon, 01 Dec 2014 11:29:12 -0800 |
parents | 09259e52a610 |
children |
comparison
equal
deleted
inserted
replaced
21822:b7e8193d0b53 | 21824:f3ffb37f88a6 |
---|---|
266 !if "x$(LD)" == "x" | 266 !if "x$(LD)" == "x" |
267 LD=link.exe | 267 LD=link.exe |
268 !endif | 268 !endif |
269 LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ | 269 LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ |
270 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ | 270 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ |
271 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ | 271 uuid.lib Wsock32.lib winmm.lib version.lib /nologo /machine:$(MACHINE) /opt:REF \ |
272 /opt:ICF,8 | 272 /opt:ICF,8 |
273 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" | 273 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
274 LD_FLAGS= $(LD_FLAGS) /map /debug | 274 LD_FLAGS= $(LD_FLAGS) /map /debug |
275 !endif | 275 !endif |
276 | 276 |