[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / windows

Diff for /OpenXM_contrib2/windows/Makefile between version 1.5 and 1.6

version 1.5, 2014/03/30 22:33:43 version 1.6, 2014/05/09 18:32:13
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.4 2014/03/30 22:29:46 ohara Exp $  # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.5 2014/03/30 22:33:43 ohara Exp $
   
 !if "$(ARCH)" == ""  !if "$(ARCH)" == ""
 ARCH=$(PROCESSOR_ARCHITECTURE)  ARCH=$(PROCESSOR_ARCHITECTURE)
Line 27  OBJS= $(SRCS:.wxs=.wixobj)
Line 27  OBJS= $(SRCS:.wxs=.wixobj)
 CANDLE = candle -nologo  CANDLE = candle -nologo
 CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDIR) \  CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDIR) \
   -dupgradeID=$(UPGRADEID) -dproductID=$(PRODUCTID) -dproductVer=$(PRODUCTVER) \    -dupgradeID=$(UPGRADEID) -dproductID=$(PRODUCTID) -dproductVer=$(PRODUCTVER) \
   -dlibDir=asir\lib -dcontribDir=asir\lib-asir-contrib \    -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \
   -dhelpDir=asir\help -dshareDir=asir\share    -dhelpDir=asir\help -dshareDir=asir\share
 LIGHT = light -nologo  LIGHT = light -nologo
 LTFLAGS = -ext WixUIExtension -ext WixUtilExtension  LTFLAGS = -ext WixUIExtension -ext WixUtilExtension

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>