=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/Makefile,v retrieving revision 1.1 retrieving revision 1.13 diff -u -p -r1.1 -r1.13 --- OpenXM_contrib2/windows/Makefile 2013/11/16 08:31:31 1.1 +++ OpenXM_contrib2/windows/Makefile 2020/02/02 05:24:44 1.13 @@ -1,4 +1,4 @@ -# $OpenXM$ +# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.12 2019/03/28 18:10:10 ohara Exp $ !if "$(ARCH)" == "" ARCH=$(PROCESSOR_ARCHITECTURE) @@ -8,29 +8,30 @@ ARCH=$(PROCESSOR_ARCHITECTURE) OS = win64 CANDLE_ARCH = -nologo -arch x64 PGDIR=ProgramFiles64Folder -PRODUCTID=D1DCD556-D731-4945-8A6B-FABA98592818 +PRODUCTID=5FCFE322-2C5D-4AF6-AB56-490A86831FD7 !else OS = win32 CANDLE_ARCH = -nologo PGDIR=ProgramFilesFolder -PRODUCTID=CB31249B-D861-4D97-9146-08FADCBA312A +PRODUCTID=4B09EBA0-88B0-4CA5-B284-AA13AC6CCA72 !endif +# DO NOT CHANGE UPGRADEID!! UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D -PRODUCTVER=1.0.0 +PRODUCTVER=1.1.0 -TARGET= asir_$(OS).msi -SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs +TARGET= asir$(OS).msi +SRCS= asir.wxs _lib.wxs _contrib.wxs _share.wxs # OBJS= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj OBJS= $(SRCS:.wxs=.wixobj) CANDLE = candle -nologo CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDIR) \ -dupgradeID=$(UPGRADEID) -dproductID=$(PRODUCTID) -dproductVer=$(PRODUCTVER) \ - -dlibDir=asir\lib -dcontribDir=asir\lib-asir-contrib \ - -dhelpDir=asir\help -dshareDir=asir\share + -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \ + -dshareDir=asir\share LIGHT = light -nologo -LTFLAGS = -ext WixUIExtension +LTFLAGS = -ext WixUIExtension -ext WixUtilExtension HEAT = heat HEATFLAGS = -nologo -gg -g1 -sfrag -srd @@ -39,40 +40,58 @@ HEATFLAGS = -nologo -gg -g1 -sfrag -srd .wxs.wixobj: $(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) copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi wxs: $(SRCS) -build_zip: +zip: @makepkg.bat -$(TARGET): $(OBJS) LICENSE.rtf build_zip +$(TARGET): $(OBJS) LICENSE.rtf zip $(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS) ## generating wxs files by heat if the directory asir exists # _lib.wxs: -# cd asir -# $(HEAT) dir lib $(HEATFLAGS) -dr LIB -cg LibGrp -var "var.libDir" -out ..\_lib.wxs -# cd .. +# 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 -# $(HEAT) dir lib-asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\_contrib.wxs -# cd .. +# 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