Mercurial > dwindows

comparison makefile.vc @ 1447:5417b312801e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -DISOLATION_AWARE_ENABLED=1 to Visual C compile flags and delete temporary manifest files after build.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 10 Dec 2011 23:11:16 +0000
parents 0676561865ac
children 2913bb58f439
comparison
equal deleted inserted replaced
1446:0d4fdf646caf 1447:5417b312801e
56 !message Revision is [$(VERREV)] 56 !message Revision is [$(VERREV)]
57 SVNVERSION=-DVER_REV=$(VERREV) 57 SVNVERSION=-DVER_REV=$(VERREV)
58 !endif 58 !endif
59 59
60 CC = cl 60 CC = cl
61 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DGDIPLUS -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR) $(SVNVERSION) 61 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DGDIPLUS -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(SVNVERSION)
62 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib userenv.lib msimg32.lib gdiplus.lib 62 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib userenv.lib msimg32.lib gdiplus.lib
63 RES = 63 RES =
64 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG) 64 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG)
65 DLLLINKFLAGS = -dll 65 DLLLINKFLAGS = -dll
66 LINK = link 66 LINK = link
74 all: dw dwcompat dwtest 74 all: dw dwcompat dwtest
75 75
76 76
77 77
78 clean: 78 clean:
79 -erase *.dll 79 -erase *.dll
80 -erase *.exe 80 -erase *.exe
81 -erase *.opt 81 -erase *.opt
82 -erase *.lib 82 -erase *.lib
83 -erase *.obj 83 -erase *.obj
84 -erase *.map 84 -erase *.map
99 $(OBJS) $(RES) 99 $(OBJS) $(RES)
100 $(LIBS) 100 $(LIBS)
101 << 101 <<
102 lib /def:$(DEFFILE) /out:dw.lib 102 lib /def:$(DEFFILE) /out:dw.lib
103 mt.exe /manifest dw.dll.manifest win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2 103 mt.exe /manifest dw.dll.manifest win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2
104 -erase dw.dll.manifest
104 copy dw.lib $(DWLIBDIR)\dw.lib 105 copy dw.lib $(DWLIBDIR)\dw.lib
105 copy dw.dll $(DWDLLDIR)\dw.dll 106 copy dw.dll $(DWDLLDIR)\dw.dll
106 107
107 dwcompat: dwcompat.dll 108 dwcompat: dwcompat.dll
108 109
113 $(OBJS2) $(RES) 114 $(OBJS2) $(RES)
114 $(LIBS) 115 $(LIBS)
115 << 116 <<
116 lib /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib 117 lib /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib
117 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2 118 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2
119 -erase dwcompat.dll.manifest
118 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib 120 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
119 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll 121 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
120 122
121 dw.obj: $(SRCDIR)\win\dw.c 123 dw.obj: $(SRCDIR)\win\dw.c
122 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c 124 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c
139 dwtest: dwtest.exe 141 dwtest: dwtest.exe
140 142
141 dwtest.exe: dwtest.obj winmain.obj 143 dwtest.exe: dwtest.obj winmain.obj
142 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS) 144 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS)
143 mt.exe /manifest dwtest.exe.manifest win\dwtest.exe.$(TARGET_CPU).manifest /outputresource:dwtest.exe;1 145 mt.exe /manifest dwtest.exe.manifest win\dwtest.exe.$(TARGET_CPU).manifest /outputresource:dwtest.exe;1
146 -erase dwtest.exe.manifest
144 147
145 zip: dw.dll 148 zip: dw.dll
146 copy win\readme-win.txt . 149 copy win\readme-win.txt .
147 zip dwindows-$(PLATFORM_NAME)-$(VERDOT).zip readme-win.txt readme dw.dll dwcompat.dll dw.lib dwcompat.lib dw.h 150 zip dwindows-$(PLATFORM_NAME)-$(VERDOT).zip readme-win.txt readme dw.dll dwcompat.dll dw.lib dwcompat.lib dw.h