--- imach/src/Makefile	2015/08/04 07:17:13	1.62
+++ imach/src/Makefile	2015/08/18 23:17:28	1.63
@@ -1,4 +1,9 @@
-VERSION=0.98q4
+#Version has to be set in ../CMakeLists.txt too.
+VERSION=0.98q5
+# DRIVEG is for VirtualBox Windows 64bit 
+DRIVEG=g:
+#DIRG is the corresponding build directory for Virtual Windows
+DIRG=\imach\cvs\imach\build
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
 IMACHSETUPVERSION=icl
 # This is for Windows only
@@ -305,8 +310,9 @@ imachICL-build: imach.c
 #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
-imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat mybuildicl32.bat
+imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 
 	pwd
+	touch setup.iss.in
 	$(SETUPCOMP) /cc setup.iss
 	$(CP) Output/$(TMPSETUPEXE) imachICL-setup
 
@@ -321,19 +327,19 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE
 	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
 	$(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup
 
-../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl64.bat
+../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat
 	rm -rf ../build/icl64  && mkdir ../build/icl64
-	cp mybuildicl64.bat ../build/icl64/
+	cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
 	cd ../build/icl64
 	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "g:\imachcvs\NetBeans\imach\build\icl64\mybuildicl64.bat" "$(VERSION)"
+	--username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
-../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl32.bat
+../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
 	rm -rf ../build/icl32 && mkdir -p ../build/icl32
-	cp mybuildicl32.bat ../build/icl32/
+	cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
 	cd ../build/icl32
 	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g:\imachcvs\NetBeans\imach\build\icl32\mybuildicl32.bat" "$(VERSION)"
+	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
 	rm -rf ../build/vs32 && mkdir -p ../build/vs32