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

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

version 1.2, 2013/12/02 14:44:23 version 1.6, 2014/05/09 18:32:13
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.1 2013/11/16 08:31:31 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 8  ARCH=$(PROCESSOR_ARCHITECTURE)
Line 8  ARCH=$(PROCESSOR_ARCHITECTURE)
 OS = win64  OS = win64
 CANDLE_ARCH = -nologo -arch x64  CANDLE_ARCH = -nologo -arch x64
 PGDIR=ProgramFiles64Folder  PGDIR=ProgramFiles64Folder
 PRODUCTID=06720E1D-70E6-4BF9-87FE-97CD310D015A  PRODUCTID=50A5B5C0-DA6D-4F10-BA45-CD5FA21EC30A
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=F6421937-684B-40CF-8F64-806B0A8B6577  PRODUCTID=476257AD-500D-4966-B792-1568697B3654
 !endif  !endif
   
 UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D  UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D
 PRODUCTVER=1.0.1  PRODUCTVER=1.0.3
   
 TARGET= asir$(OS).msi  TARGET= asir$(OS).msi
 SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs  SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs
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
Line 46  msi: $(TARGET)
Line 46  msi: $(TARGET)
   
 wxs: $(SRCS)  wxs: $(SRCS)
   
 build_zip:  zip:
         @makepkg.bat          @makepkg.bat
   
 $(TARGET): $(OBJS) LICENSE.rtf build_zip  $(TARGET): $(OBJS) LICENSE.rtf zip
         $(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS)          $(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS)
   
 ## generating wxs files by heat if the directory asir exists  ## generating wxs files by heat if the directory asir exists

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

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