aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-02-02 02:10:24 +0000
committerBill Meier <wmeier@newsguy.com>2011-02-02 02:10:24 +0000
commit81a35645ef8f8a19c3f4845c9c582a49e4a8732f (patch)
tree290c2638dca868ffe7b70b2ceae5a6d89400f34f /packaging
parentd3efa3ed9f5955bbb5924ce6beeeeb9c082d0b22 (diff)
Use $(WARNINGS_ARE_ERRORS) (defined in config.nmake) iso -WX
svn path=/trunk/; revision=35748
Diffstat (limited to 'packaging')
-rw-r--r--packaging/u3/tools/makefile.nmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/u3/tools/makefile.nmake b/packaging/u3/tools/makefile.nmake
index 8acdab6a87..dd7d696b4c 100644
--- a/packaging/u3/tools/makefile.nmake
+++ b/packaging/u3/tools/makefile.nmake
@@ -14,23 +14,23 @@ COPY = copy
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 /ENTRY:mainCRTStartup $(LOCAL_LDFLAGS)
-CFLAGS=-WX -DHAVE_CONFIG_H $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) -DHAVE_CONFIG_H $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
all: utest.exe libgcrypt-11.dll libgpg-error-0.dll
-utest.exe: uuid.obj sysdep.obj utest.obj
+utest.exe: uuid.obj sysdep.obj utest.obj
@echo Linking $@
- $(LINK) /OUT:utest.exe $(guiflags) $(LDFLAGS) utest.obj uuid.obj sysdep.obj $(GNUTLS_LIBS) $(guilibsdll)
+ $(LINK) /OUT:utest.exe $(guiflags) $(LDFLAGS) utest.obj uuid.obj sysdep.obj $(GNUTLS_LIBS) $(guilibsdll)
!IF $(MSC_VER_REQUIRED) >= 1400
mt.exe -nologo -manifest "utest.exe.manifest" -outputresource:utest.exe;1
!ENDIF
libgcrypt-11.dll libgpg-error-0.dll: $(GNUTLS_DIR)\bin\$@
$(COPY) $(GNUTLS_DIR)\bin\$@ $@
-
+
clean:
rm -rf utest.exe *.obj *.manifest
rm -rf libgcrypt-11.dll libgpg-error-0.dll