Skip to content

Commit

Permalink
get rid of vcredist in win32 installer:
Browse files Browse the repository at this point in the history
mingwlibs (AFAIK) don't use msvc compiled libs any more
  • Loading branch information
abma committed Jun 19, 2020
1 parent a96e405 commit bd446e1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 28 deletions.
5 changes: 0 additions & 5 deletions installer/make_installer.sh
Expand Up @@ -26,10 +26,6 @@ fi
mkdir -p installer/downloads
cd installer/downloads

if ! [ -s vcredist_x86.exe ]; then
$WGET http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe
fi

if [ ! -s spring_testing_minimal-portable.7z ]; then
echo "Warning: spring_testing_minimal-portable.7z didn't exist, downloading..." >&2
$WGET https://springrts.com/dl/buildbot/default/master/spring_testing_minimal-portable.7z
Expand All @@ -43,6 +39,5 @@ installer/make_uninstall_nsh.py installer/downloads/spring_testing_minimal-porta

makensis -V3 $NSISDEFINES $@ -DNSI_UNINSTALL_FILES=downloads/uninstall.nsh \
-DMIN_PORTABLE_ARCHIVE=downloads/spring_testing_minimal-portable.7z \
-DVCREDIST=downloads/vcredist_x86.exe \
installer/spring.nsi

9 changes: 0 additions & 9 deletions installer/sections/vcredist.nsh

This file was deleted.

14 changes: 0 additions & 14 deletions installer/spring.nsi
Expand Up @@ -100,13 +100,6 @@ ${!echonow} "Base dir: <engine-source-root>/installer/"
${!echonow} "Using NSI_UNINSTALL_FILES: ${NSI_UNINSTALL_FILES}"
!endif

!ifndef VCREDIST
!error "VCREDIST not defined"
!else
${!echonow} "Using VCREDIST: ${VCREDIST}"
!endif


Section "Engine" SEC_MAIN
; make this section read-only -> user can not deselect it
SectionIn RO
Expand Down Expand Up @@ -141,13 +134,6 @@ Section /o "Portable" SEC_PORTABLE
!undef INSTALL
SectionEnd

Section "" SEC_VCREDIST
!define INSTALL
${!echonow} "Processing: vcredist"
!include "sections\vcredist.nsh"
!undef INSTALL
SectionEnd

!include "sections\sectiondesc.nsh"

Section -Post
Expand Down

0 comments on commit bd446e1

Please sign in to comment.