Use statically linked UpdateElevate

psieg · Feb 10, 2024 · c20381b · c20381b
1 parent 90bfee6
commit c20381b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 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/dist_windows/script_qt6.iss b/Software/dist_windows/script_qt6.iss
@@ -66,11 +66,8 @@ Source: "content/prismatik-unhook32.dll"; DestDir: "{app}"; MinVersion: 6.1.7600
 Source: "content/UpdateElevate.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "content/platforms/*"; DestDir: "{app}\platforms"; Flags: ignoreversion
 Source: "content/styles/*"; DestDir: "{app}\styles"; Flags: ignoreversion
-Source: "content/tls/qopensslbackend.dll"; DestDir: "{app}\tls"; Flags: ignoreversion
+Source: "content/tls/qschannelbackend.dll"; DestDir: "{app}\styles"; Flags: ignoreversion
 Source: "content/Plugins/*"; DestDir: "{#UserSettingsDirName}\Plugins"; Flags: onlyifdoesntexist createallsubdirs recursesubdirs
-; Use ssleay32.dll and libeay32.dll here for OpenSSL < 1.1, 1_1 instead of 3 for OpenSSL 1.1
-Source: "content/libcrypto-3-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "content/libssl-3-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
 ; These are needed only when including the bass library for sound visualization
 Source: "content/bass.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "content/basswasapi.dll"; DestDir: "{app}"; Flags: ignoreversion

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