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

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

version 1.13, 2020/02/02 05:24:44 version 1.14, 2020/02/02 05:41:42
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.12 2019/03/28 18:10:10 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 70  msi: $(TARGET)
Line 70  msi: $(TARGET)
   
 wxs: $(SRCS)  wxs: $(SRCS)
   
 zip:  zip: build
         @makepkg.bat          @makepkg.bat
   
 $(TARGET): $(OBJS) LICENSE.rtf zip  $(TARGET): $(OBJS) LICENSE.rtf zip
Line 78  $(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 ..  
 #  
 # _contrib.wxs:  
 #       cd asir\lib  
 #       $(HEAT) dir asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\..\_contrib.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.13  
changed lines
  Added in v.1.14
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>