|
From: <jgr...@us...> - 2003-11-05 18:53:10
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv6675 Modified Files: Makefile Log Message: Update Makefile to pass the POPFIle version information to MAKENSIS Index: Makefile =================================================================== RCS file: /cvsroot/popfile/windows/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 15 Oct 2003 17:07:28 -0000 1.14 --- Makefile 5 Nov 2003 18:46:51 -0000 1.15 *************** *** 17,24 **** --- 17,28 ---- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # + .PHONY: all build include ..\engine\vars.mak + MAKENSIS_VERSION_STRING:=/DC_POPFILE_MAJOR_VERSION=$(POPFILE_MAJOR_VERSION) /DC_POPFILE_MINOR_VERSION=$(POPFILE_MINOR_VERSION) /DC_POPFILE_REVISION=$(POPFILE_REVISION) /DC_POPFILE_RC=$(RC) + + MAKENSIS=../NSIS/makensis.exe $(MAKENSIS_VERSION_STRING) /V4 $< BUILD_ZIP=../engine/wzzip -P $(POPFILE_WINDOWS_ZIP) -a $^ *************** *** 32,37 **** setup.exe: stop_pf.exe ../engine/popfile.exe ../engine/popfileb.exe ../engine/popfileib.exe ../engine/popfilef.exe ../engine/popfileif.exe setup.exe: installer.nsi ioA.ini ioB.ini CBP.nsh ! @../NSIS/makensis.exe /V4 $< stop_pf.exe: stop_popfile.nsi ! @../NSIS/makensis.exe /V4 $< --- 36,41 ---- setup.exe: stop_pf.exe ../engine/popfile.exe ../engine/popfileb.exe ../engine/popfileib.exe ../engine/popfilef.exe ../engine/popfileif.exe setup.exe: installer.nsi ioA.ini ioB.ini CBP.nsh ! @$(MAKENSIS) stop_pf.exe: stop_popfile.nsi ! @$(MAKENSIS) |