[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.18

version 1.15, 2020/02/02 11:53:07 version 1.18, 2022/03/30 04:58:53
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.17 2021/05/12 08:27:26 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=EEC1D477-7925-4B4D-8484-5174FD6D97C5
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=4B09EBA0-88B0-4CA5-B284-AA13AC6CCA72  PRODUCTID=95F4A064-CFE0-45D4-AA55-F87921432478
 !endif  !endif
   
 # DO NOT CHANGE UPGRADEID!!  # DO NOT CHANGE UPGRADEID!!
Line 48  build: ..\asir-gc\gc\gc.lib asir2000lib\asir2000lib.li
Line 48  build: ..\asir-gc\gc\gc.lib asir2000lib\asir2000lib.li
         cd ..\asir-gc && $(MAKE) -e -f Makefile.vc          cd ..\asir-gc && $(MAKE) -e -f Makefile.vc
   
 asir2000lib\asir2000lib.lib: ..\asir-gc\gc\gc.lib  asir2000lib\asir2000lib.lib: ..\asir-gc\gc\gc.lib
         cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)          cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH) CC=clang-cl
   
 engine2000\engine.exe: asir2000lib\asir2000lib.lib  engine2000\engine.exe: asir2000lib\asir2000lib.lib
         cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)          cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
Line 63  post-msg-asirgui\cmdasir.exe:
Line 63  post-msg-asirgui\cmdasir.exe:
         cd $(@D) && $(MAKE) -e -f Makefile.vc          cd $(@D) && $(MAKE) -e -f Makefile.vc
   
 ..\asir2018\asir.exe: ..\asir-gc\gc\gc.lib  ..\asir2018\asir.exe: ..\asir-gc\gc\gc.lib
         cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)          cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH) CC=clang-cl
   
 msi: $(TARGET)  msi: $(TARGET) wxs
         copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi          copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi
   
 wxs: $(SRCS)  wxs: $(SRCS)
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 nmake WXS=1 _contrib.wxs or run nmake WXS=1 wxs
   
 !ifdef WXS  !ifdef WXS
 _lib.wxs: zip  _lib.wxs: zip
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.18
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>