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

Diff for /OpenXM_contrib2/windows/Makefile between version 1.7 and 1.14

version 1.7, 2014/05/14 03:50:15 version 1.14, 2020/02/02 05:41:42
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.6 2014/05/09 18:32:13 ohara Exp $  # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.13 2020/02/02 05:24:44 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=50A5B5C0-DA6D-4F10-BA45-CD5FA21EC30A  PRODUCTID=5FCFE322-2C5D-4AF6-AB56-490A86831FD7
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=476257AD-500D-4966-B792-1568697B3654  PRODUCTID=4B09EBA0-88B0-4CA5-B284-AA13AC6CCA72
 !endif  !endif
   
   # DO NOT CHANGE UPGRADEID!!
 UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D  UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D
 PRODUCTVER=1.0.3  PRODUCTVER=1.1.0
   
 TARGET= asir$(OS).msi  TARGET= asir$(OS).msi
 SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs _doc.wxs  SRCS= asir.wxs _lib.wxs _contrib.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 28  CANDLE = candle -nologo
Line 29  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\asir -dcontribDir=asir\lib\asir-contrib \    -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \
   -dhelpDir=asir\help -dshareDir=asir\share -ddocDir=asir\doc    -dshareDir=asir\share
 LIGHT = light -nologo  LIGHT = light -nologo
 LTFLAGS = -ext WixUIExtension -ext WixUtilExtension  LTFLAGS = -ext WixUIExtension -ext WixUtilExtension
 HEAT = heat  HEAT = heat
Line 39  HEATFLAGS = -nologo -gg -g1 -sfrag -srd
Line 40  HEATFLAGS = -nologo -gg -g1 -sfrag -srd
 .wxs.wixobj:  .wxs.wixobj:
         $(CANDLE) $(CANDLE_FLAGS) $<          $(CANDLE) $(CANDLE_FLAGS) $<
   
 all:  all: build
   
   build: ..\asir-gc\gc\gc.lib asir2000lib\asir2000lib.lib engine2000\engine.exe asir32gui\asirgui.exe mcpp\cpp.exe post-msg-asirgui\cmdasir.exe ..\asir2018\asir.exe
   
   ..\asir-gc\gc\gc.lib:
           cd ..\asir-gc && $(MAKE) -e -f Makefile.vc
   
   asir2000lib\asir2000lib.lib: ..\asir-gc\gc\gc.lib
           cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
   
   engine2000\engine.exe: asir2000lib\asir2000lib.lib
           cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
   
   asir32gui\asirgui.exe:
           cd $(@D) && $(MAKE) -e -f Makefile.vc
   
   mcpp\cpp.exe:
           cd $(@D) && $(MAKE) -e -f Makefile.vc
   
   post-msg-asirgui\cmdasir.exe:
           cd $(@D) && $(MAKE) -e -f Makefile.vc
   
   ..\asir2018\asir.exe: ..\asir-gc\gc\gc.lib
           cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
   
 msi: $(TARGET)  msi: $(TARGET)
         copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi          copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi
   
 wxs: $(SRCS)  wxs: $(SRCS)
   
 zip:  zip: build
         @makepkg.bat          @makepkg.bat
   
 $(TARGET): $(OBJS) LICENSE.rtf zip  $(TARGET): $(OBJS) LICENSE.rtf zip
Line 54  $(TARGET): $(OBJS) LICENSE.rtf zip
Line 78  $(TARGET): $(OBJS) LICENSE.rtf zip
   
 ## generating wxs files by heat if the directory asir exists  ## generating wxs files by heat if the directory asir exists
   
 # _lib.wxs:  !IFDEF WXS
 #       cd asir\lib  _lib.wxs: zip
 #       $(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_lib.wxs          cd asir\lib && $(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_lib.wxs
 #       cd ..\..  
 #  
 # _help.wxs:  
 #       cd asir  
 #       $(HEAT) dir help $(HEATFLAGS) -dr HELP  -cg HelpGrp -var "var.helpDir"  -out ..\_help.wxs  
 #       cd ..  
 #  
 # _share.wxs:  
 #       cd asir  
 #       $(HEAT) dir share $(HEATFLAGS) -dr SHARE -cg ShareGrp -var "var.shareDir" -out ..\_share.wxs  
 #       cd ..  
 #  
 # _contrib.wxs:  
 #       cd asir\lib  
 #       $(HEAT) dir asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\..\_contrib.wxs  
 #       cd ..\..  
 #  
 # _doc.wxs:  
 #       cd asir  
 #       $(HEAT) dir doc $(HEATFLAGS) -dr DOC -cg DocGrp -var "var.docDir" -out ..\_doc.wxs  
 #       cd ..  
 #  
 # wxsclean:  
 #       @del /q _*.wxs  
   
   _help.wxs: zip
           cd asir && $(HEAT) dir help $(HEATFLAGS) -dr HELP  -cg HelpGrp -var "var.helpDir"  -out ..\_help.wxs
   
   _contrib.wxs: zip
           cd asir\lib && $(HEAT) dir asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\..\_contrib.wxs
   !ENDIF
   
   wxsclean:
           @del /q _*.wxs
   
 clean:  clean:
         @del /q *.wixobj          @del /q *.wixobj
         @del /q *.wixpdb          @del /q *.wixpdb
   
 distclean: clean  distclean: clean
         @distclean.bat          @if exist asir ( rmdir /s /q asir )
           @for %i in ( ..\asir-gc asir2000lib engine2000 mcpp asir32gui post-msg-asirgui ..\asir2018 ) do ( pushd %i && nmake -f Makefile.vc distclean && popd)
   
 msiclean:  msiclean:
         @del /q $(TARGET)          @del /q $(TARGET)
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.14
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>