diff --git a/AutoGeneratedFile.tar.gz b/AutoGeneratedFile.tar.gz index dfb4e2c90..9dd240e98 100644 Binary files a/AutoGeneratedFile.tar.gz and b/AutoGeneratedFile.tar.gz differ diff --git a/bin/compile-version-MacOS b/bin/compile-version-MacOS index cd8f42c11..8ebb46967 100755 --- a/bin/compile-version-MacOS +++ b/bin/compile-version-MacOS @@ -1,3 +1,6 @@ +# Warning after version Sonoma 14.xx MACOS it is impossible to change application directory +# +# echo usage: $0 branchgit dircompilation optionconf [addprefix] [addconf] exec 3>&1 # save stdout stream echo2() { echo "$@"; echo "$@" 1>&3; } @@ -62,6 +65,7 @@ exec 1>$LOG 2>&1 # save log is $LOG echo2 compilation FreeFEM version ${ver} on Mac ${arch} in $(pwd) echo2 ========================================================== + prefix=/Applications/FreeFem++.app/Contents/ff-$verb$addprefix echo2 prefix = $prefix test -d $prefix || mkdir -p $prefix diff --git a/src/bin-win32/Makefile.am b/src/bin-win32/Makefile.am index 851bea6f6..1c7ef6cd5 100755 --- a/src/bin-win32/Makefile.am +++ b/src/bin-win32/Makefile.am @@ -67,12 +67,12 @@ all-local: $(WIN32DLLTARGET) # correctly built. if ENABLE_FFCS -win32-dll-target: FreeFem++.exe ff-c++ +win32-dll-target: FreeFem++.exe ff-c++ md2edp.exe -for i in $(LDADD2) ; do case $$i in *.dll) echo cp -p $$i .; cp -p $$i . ;; esac ; done ./copy-dll.sh echo "on a fini" else -win32-dll-target: FreeFem++.exe FreeFem++-nw.exe bamg.exe cvmsh2.exe launchff++.exe ff-c++ $(MPIPROG) +win32-dll-target: FreeFem++.exe FreeFem++-nw.exe bamg.exe cvmsh2.exe launchff++.exe ff-c++ md2edp.exe $(MPIPROG) -cp ../nw/ffglut.exe . 2> /dev/null -for i in $(LDADD2) ; do case $$i in *.dll) echo cp -p $$i .; cp -p $$i . ;; esac ; done ./copy-dll.sh