User: vg Date: 2007/03/26 07:00:05 Modified: dba/connectivity/source/drivers/mozab/makefile.mk
Log: INTEGRATION: CWS mingwport03 (1.21.142); FILE MERGED 2007/03/19 15:59:23 vg 1.21.142.3: RESYNC: (1.22-1.23); FILE MERGED 2006/11/07 13:08:50 vg 1.21.142.2: RESYNC: (1.21-1.22); FILE MERGED 2006/09/07 10:22:06 vg 1.21.142.1: #i53572# MinGW port File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.24&r2=1.25 Delta lines: +7 -3 ------------------- --- makefile.mk 9 Mar 2007 08:59:26 -0000 1.24 +++ makefile.mk 26 Mar 2007 14:00:03 -0000 1.25 @@ -66,10 +66,14 @@ .ENDIF .ENDIF -.IF "$(COM)"=="MSC" +.IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom +.ELSE LIB += $(MOZ_LIB) MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib -.ELSE "$(COM)"=="MSC" +.ENDIF +.ELSE "$(OS)"=="WNT" MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom .ENDIF #End of mozilla specific stuff. @@ -176,7 +180,7 @@ .IF "$(GUI)"=="WNT" SHL2STDLIBS += \ - shell32.lib + $(SHELL32LIB) .ENDIF # "$(GUI)"=="WNT" SHL2DEPN= --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
