[Fedora-directory-commits] esc/src/app/xpcom Makefile.moz,1.5,1.6

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23750

Modified Files:
	Makefile.moz 
Log Message:
Changes for Windows.



Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.moz	10 Jan 2007 02:20:13 -0000	1.5
+++ Makefile.moz	2 Feb 2007 22:13:54 -0000	1.6
@@ -35,9 +35,9 @@
 
 DEPLOY_OBJDIR           = $(CORE_DEPTH)/dist/$(OBJDIR)/esc_build
 
-XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.1.*.tar.gz 
+XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.4.*.tar.gz 
 ifeq ($(OS_ARCH),WINNT)
-XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.1.*.win32.zip
+XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.4.*.win32.zip
 endif
 XULRUNNER_BIN_PATH	= $(MOZ_OBJDIR)/dist/xulrunner
 XULRUNNER_EXEC		= xulrunner
@@ -75,7 +75,8 @@
 
 
 ifeq ($(OS_ARCH),WINNT)
-COOLKEY_LIBS	= $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib  $(CKY_LIB_LDD) $(CORE_DIST)/lib/ckyapplet.lib
+COOLKEY_LIBS	= $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib  $(CKY_LIB_LDD)/libckyapplet.lib
+OS_LIBS+= /NODEFAULTLIB:libc.lib
 TESTCPPSRCS	= CoolKeyCSP.cpp
 MOZ_NO_DEBUG_RTL=1
 else
@@ -212,7 +213,7 @@
 endif
 ifeq ($(OS_ARCH),WINNT)
 	unzip $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME) -d $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc
-	cp -f $(XPCOM_EXTRA)  $(DEPLOY_OBJDIR)/ESC/components
+	#cp -f $(XPCOM_EXTRA)  $(DEPLOY_OBJDIR)/ESC/components
 endif
 ifdef DESTDIR
 	$(NSINSTALL) $(DEPLOY_OBJDIR) $(DESTDIR)