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

Diff for /OpenXM_contrib2/windows/Makefile between version 1.15 and 1.16

version 1.15, 2020/02/02 11:53:07 version 1.16, 2021/03/25 06:31:59
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.14 2020/02/02 05:41:42 ohara Exp $  # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.15 2020/02/02 11:53:07 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=5FCFE322-2C5D-4AF6-AB56-490A86831FD7  PRODUCTID=15DF8683-87F0-4AA3-99F1-9569E3ADA27F
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=4B09EBA0-88B0-4CA5-B284-AA13AC6CCA72  PRODUCTID=C9E9BA50-34E6-4A03-BDCD-2632FD445570
 !endif  !endif
   
 # DO NOT CHANGE UPGRADEID!!  # DO NOT CHANGE UPGRADEID!!
Line 96  zip: install
Line 96  zip: install
 $(TARGET): $(OBJS) LICENSE.rtf 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  ## The wxs files were generated by heat.
   ## To update _contrib.wxs, run make WXS=1 _contrib.wxs
   
 !ifdef WXS  !ifdef WXS
 _lib.wxs: zip  _lib.wxs: zip

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

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