Use statically linked UpdateElevate

psieg · Feb 10, 2024 · 1d47993 · 1d47993
1 parent 218152c
commit 1d47993
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,7 +56,8 @@ Software/dmg/contents
 build-vars.prf
 debug/
 release/
-Software/dist_windows/content
+Software/dist_windows/content/*
+!Software/dist_windows/content/UpdateElevate.exe
 Software/lib
 Software/.vs
 *.vcxproj

diff --git a/Software/UpdateElevate b/Software/UpdateElevate
diff --git a/Software/dist_windows/content/UpdateElevate.exe b/Software/dist_windows/content/UpdateElevate.exe
diff --git a/Software/scripts/win32/prepare_installer.sh b/Software/scripts/win32/prepare_installer.sh
@@ -3,11 +3,15 @@
 set -e
 
 # build UpdateElevate
-echo "#define NAME L\"Prismatik\"" > UpdateElevate/UpdateElevate/command.h
-echo "#define EXT L\".exe\"" >> UpdateElevate/UpdateElevate/command.h
-echo "#define ARGS L\" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART\"" >> UpdateElevate/UpdateElevate/command.h
-cmd //c scripts\\win32\\build_UpdateElevate.bat
-cp UpdateElevate/x64/Release/UpdateElevate.exe dist_windows/content/
+if [ -f dist_windows/content/UpdateElevate.exe ]; then
+	echo "Using existing (frozen) UpdateElevate";
+else
+	echo "#define NAME L\"Prismatik\"" > UpdateElevate/UpdateElevate/command.h
+	echo "#define EXT L\".exe\"" >> UpdateElevate/UpdateElevate/command.h
+	echo "#define ARGS L\" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART\"" >> UpdateElevate/UpdateElevate/command.h
+	cmd //c scripts\\win32\\build_UpdateElevate.bat
+	cp UpdateElevate/x64/Release/UpdateElevate.exe dist_windows/content/
+fi
+ −		UpdateElevate/Resource.rc
+3 −3		UpdateElevate/UpdateElevate.vcxproj
+1 −1		UpdateElevate/command.h
+1 −1		UpdateElevate/main.cpp