From 62d9c646dd411f1cc067de804880751b9aaa0a77 Mon Sep 17 00:00:00 2001
From: Frederico Linhares <fred@linhares.blue>
Date: Thu, 11 Jan 2024 15:31:18 -0300
Subject: fixt Fix several bugs in the Windows installation

* Rakefile: Link against winsock2
* ruby_build_config.rb: Add sockets to the engine for on-line gaming.

* src/core.cpp: Windows needs to read mrb files as binaries.

* windows_installer.nsi: write uninstaller before listing files seems to
cause bugs.
---
 windows_installer.nsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'windows_installer.nsi')

diff --git a/windows_installer.nsi b/windows_installer.nsi
index 31a39c5..cbe11a8 100644
--- a/windows_installer.nsi
+++ b/windows_installer.nsi
@@ -28,8 +28,6 @@ Page instfiles
 UninstPage instfiles
 
 Section
-  WriteUninstaller $INSTDIR\${UNINSTNAME}.exe
-
   SetOutPath "$INSTDIR"
   File candy_gear.exe
   File "$%DLL_PATH%\\libbrotlicommon.dll"
@@ -60,13 +58,15 @@ Section
   SetOutPath "$INSTDIR\lib"
   File /r lib\*.rb
 
+  WriteUninstaller $INSTDIR\${UNINSTNAME}.exe
+
   WriteRegStr ${REGHKEY} "${REGPATH}\${REGAPPKEY}" "InstallLocation" \
     "$INSTDIR"
 
   WriteRegStr ${REGHKEY} "${REGPATH_WINUNINST}\${REGAPPKEY}" "DisplayName" \
     "CandyGear"
   WriteRegStr ${REGHKEY} "${REGPATH_WINUNINST}\${REGAPPKEY}" \
-    "UninstallString" '"$INSTDIR\${UNINSTNAME}.exe"'
+    "UninstallString" "$INSTDIR\${UNINSTNAME}.exe"
   WriteRegStr ${REGHKEY} "${REGPATH_WINUNINST}\${REGAPPKEY}" \
     "InstallLocation" "$INSTDIR"
 SectionEnd
-- 
cgit v1.2.3