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

Diff for /OpenXM_contrib2/windows/Makefile between version 1.1 and 1.3

version 1.1, 2013/11/16 08:31:31 version 1.3, 2013/12/17 19:22:43
Line 1 
Line 1 
 # $OpenXM$  # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.2 2013/12/02 14:44:23 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=D1DCD556-D731-4945-8A6B-FABA98592818  PRODUCTID=A73252DC-E8C3-4C0D-8DAE-FA580B948B20
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=CB31249B-D861-4D97-9146-08FADCBA312A  PRODUCTID=FC1DC24C-9B40-416D-8C8D-B087B8CE5375
 !endif  !endif
   
 UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D  UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D
 PRODUCTVER=1.0.0  PRODUCTVER=1.0.2
   
 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
 # OBJS= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj  # OBJS= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj
 OBJS= $(SRCS:.wxs=.wixobj)  OBJS= $(SRCS:.wxs=.wixobj)
Line 30  CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDI
Line 30  CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDI
   -dlibDir=asir\lib -dcontribDir=asir\lib-asir-contrib \    -dlibDir=asir\lib -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  LTFLAGS = -ext WixUIExtension -ext WixUtilExtension
 HEAT = heat  HEAT = heat
 HEATFLAGS = -nologo -gg -g1 -sfrag -srd  HEATFLAGS = -nologo -gg -g1 -sfrag -srd
   
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.1  
changed lines
  Added in v.1.3
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>