IOQ3 commit 2375

reaction/misc/nsis/ioquake3.nsi.in

@@ -78,9 +78,24 @@ Section "ioquake3 (required)"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
 
+!ifndef USE_INTERNAL_SPEEX
+  File "libspeex.dll"
+!endif
+!ifndef USE_INTERNAL_ZLIB
+  File "zlib1.dll"
+!endif
+!ifndef USE_INTERNAL_JPEG
+  File "jpeg8c.dll"
+!endif
+
   ; Put file there
   File "../../build/release-mingw32-x86/ioq3ded.x86.exe"
   File "../../build/release-mingw32-x86/ioquake3.x86.exe"
+!ifdef USE_RENDERER_DLOPEN
+  File "../../build/release-mingw32-x86/renderer_opengl1_x86.dll"
+  File "../../build/release-mingw32-x86/renderer_rend2_x86.dll"
+!endif
+
   File "../../COPYING.txt"
   File "/oname=README.txt" "../../README"
   File "../../id-readme.txt"
@@ -125,6 +140,7 @@ Section "SDL.dll"
 
 SectionEnd
 
+!ifdef USE_OPENAL_DLOPEN
 Section "OpenAL-Soft library"
 
   SetOutPath $INSTDIR
@@ -132,6 +148,17 @@ Section "OpenAL-Soft library"
   File "OpenAL32.dll"
 
 SectionEnd
+!endif
+
+!ifdef USE_CURL_DLOPEN
+Section "libcurl"
+
+  SetOutPath $INSTDIR
+
+  File "libcurl-4.dll"
+
+SectionEnd
+!endif
 
 ;--------------------------------
 
@@ -152,15 +179,32 @@ Section "Uninstall"
   Delete $INSTDIR\missionpack\uix86.dll
   Delete $INSTDIR\ioquake3.x86.exe
   Delete $INSTDIR\ioq3ded.x86.exe
+!ifdef USE_RENDERER_DLOPEN
+  Delete $INSTDIR\renderer_opengl1_x86.dll
+!endif
 
   Delete $INSTDIR\COPYING.txt
   Delete $INSTDIR\README.txt
   Delete $INSTDIR\id-readme.txt
   Delete $INSTDIR\voip-readme.txt
 
-  Delete $INSTDIR\SDL.dll
+!ifndef USE_INTERNAL_SPEEX
+  Delete $INSTDIR\libspeex.dll
+!endif
+!ifndef USE_INTERNAL_ZLIB
+  Delete $INSTDIR\zlib1.dll
+!endif
+!ifndef USE_INTERNAL_JPEG
+  Delete $INSTDIR\jpeg8c.dll
+!endif
 
+  Delete $INSTDIR\SDL.dll
+!ifdef USE_OPENAL_DLOPEN
   Delete $INSTDIR\OpenAL32.dll
+!endif
+!ifdef USE_CURL_DLOPEN
+  Delete $INSTDIR\libcurl-4.dll
+!endif
 
   Delete $INSTDIR\uninstall.exe