comparison makefile.vc @ 772:b28ec71cfc88

Add -MT or -MTd switch to DEBUG switches
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 19 Mar 2011 01:16:42 +0000
parents 842bc671eaa7
children 3e393a9375c4
comparison
equal deleted inserted replaced
771:5cca4ebcca9a 772:b28ec71cfc88
37 37
38 # 38 #
39 # Settings for either debug or release 39 # Settings for either debug or release
40 # 40 #
41 !if "$(DEBUG)" == "Y" 41 !if "$(DEBUG)" == "Y"
42 CFLAGS_DEBUG = -DDEBUG -Z7 -Od # was -Zi 42 CFLAGS_DEBUG = -DDEBUG -Z7 -Od -MTd # was -Zi
43 LINK_DEBUG = -debug 43 LINK_DEBUG = -debug
44 !else 44 !else
45 CFLAGS_DEBUG = -Ox 45 CFLAGS_DEBUG = -Ox -MT
46 LINK_DEBUG = -release 46 LINK_DEBUG = -release
47 !endif 47 !endif
48 48
49 CC = cl 49 CC = cl
50 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR) 50 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR)
51 CFLAGS_COMPILE = -MTd # was -MD
52 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib 51 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib
53 RES = 52 RES =
54 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG) 53 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG)
55 DLLLINKFLAGS = -dll 54 DLLLINKFLAGS = -dll
56 LINK = link 55 LINK = link
104 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2 103 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2
105 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib 104 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
106 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll 105 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
107 106
108 dw.obj: $(SRCDIR)\win\dw.c 107 dw.obj: $(SRCDIR)\win\dw.c
109 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\dw.c 108 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c
110 109
111 browser.obj: $(SRCDIR)\win\browser.c 110 browser.obj: $(SRCDIR)\win\browser.c
112 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\browser.c 111 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\browser.c
113 112
114 XBrowseForFolder.obj: $(SRCDIR)\win\XBrowseForFolder.cpp 113 XBrowseForFolder.obj: $(SRCDIR)\win\XBrowseForFolder.cpp
115 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\XBrowseForFolder.cpp 114 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\XBrowseForFolder.cpp
116 115
117 dirent.obj: $(SRCDIR)\win\dirent.c 116 dirent.obj: $(SRCDIR)\win\dirent.c
118 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\dirent.c 117 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dirent.c
119 118
120 compat.obj: $(SRCDIR)\compat.c 119 compat.obj: $(SRCDIR)\compat.c
121 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\compat.c 120 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\compat.c
122 121
123 dwtest.obj: $(SRCDIR)\dwtest.c 122 dwtest.obj: $(SRCDIR)\dwtest.c
124 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\dwtest.c 123 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwtest.c
125 124
126 dwtest: dwtest.exe 125 dwtest: dwtest.exe
127 126
128 dwtest.exe: dwtest.obj winmain.obj 127 dwtest.exe: dwtest.obj winmain.obj
129 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS) 128 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS)