=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- OpenXM_contrib2/windows/Makefile 2021/03/25 06:31:59 1.16 +++ OpenXM_contrib2/windows/Makefile 2021/05/12 08:27:26 1.17 @@ -1,4 +1,4 @@ -# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.15 2020/02/02 11:53:07 ohara Exp $ +# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.16 2021/03/25 06:31:59 ohara Exp $ !if "$(ARCH)" == "" ARCH=$(PROCESSOR_ARCHITECTURE) @@ -8,12 +8,12 @@ ARCH=$(PROCESSOR_ARCHITECTURE) OS = win64 CANDLE_ARCH = -nologo -arch x64 PGDIR=ProgramFiles64Folder -PRODUCTID=15DF8683-87F0-4AA3-99F1-9569E3ADA27F +PRODUCTID=EEC1D477-7925-4B4D-8484-5174FD6D97C5 !else OS = win32 CANDLE_ARCH = -nologo PGDIR=ProgramFilesFolder -PRODUCTID=C9E9BA50-34E6-4A03-BDCD-2632FD445570 +PRODUCTID=95F4A064-CFE0-45D4-AA55-F87921432478 !endif # DO NOT CHANGE UPGRADEID!! @@ -65,7 +65,7 @@ post-msg-asirgui\cmdasir.exe: ..\asir2018\asir.exe: ..\asir-gc\gc\gc.lib cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH) -msi: $(TARGET) +msi: $(TARGET) wxs copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi wxs: $(SRCS) @@ -97,7 +97,7 @@ $(TARGET): $(OBJS) LICENSE.rtf zip $(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS) ## The wxs files were generated by heat. -## To update _contrib.wxs, run make WXS=1 _contrib.wxs +## To update _contrib.wxs, run nmake WXS=1 _contrib.wxs or run nmake WXS=1 wxs !ifdef WXS _lib.wxs: zip