openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

More fixes/tweaks to the installer

Browse Source 
- Add Windows icon for scenario files (using the old Mac icon)
- Fix OpenAL not being deleted, causing the program directory to remain
- Fix association for old scenarios (.exs) not being removed
Also:
- Fix build broken in previous commit (due to header renames)
This commit is contained in:
Celtic Minstrel
2015-06-09 10:26:08 -04:00
parent b22f2e2e47
commit 233a50a1e2
11 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/BoE.vsproj/Game/Blades of Exile.rc
View File

@@ -33,6 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// remains consistent on all systems.
IDI_BLADESOFEXILE ICON "../../../rsrc/icons/win/BOE Icon.ico"
IDI_BOESAVE ICON "../../../rsrc/icons/win/BoE Save.ico"
IDI_BOESCEN ICON "../../../rsrc/icons/win/BoE Scenario.ico"
/////////////////////////////////////////////////////////////////////////////
//

1
src/BoE.vsproj/Game/Blades of Exile.vcxproj
View File

@@ -159,6 +159,7 @@
<ItemGroup>
<Image Include="..\..\..\rsrc\icons\win\BOE Icon.ico" />
<Image Include="..\..\..\rsrc\icons\win\BOE Save.ico" />
<Image Include="..\..\..\rsrc\icons\win\BOE Scenario.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

3
src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters
View File

@@ -168,5 +168,8 @@
<Image Include="..\..\..\rsrc\icons\win\BOE Save.ico">
<Filter>Resource Files</Filter>
</Image>
<Image Include="..\..\..\rsrc\icons\win\BOE Scenario.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>

5
src/BoE.vsproj/Game/boeresource.h
View File

@@ -40,15 +40,16 @@
#define IDM_HELP_TOWN 143
#define IDM_OPTIONS_JOURNAL 144
#define IDI_BOESAVE 145
#define IDI_BOESCEN 146
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 131
#define _APS_NEXT_RESOURCE_VALUE 147
#define _APS_NEXT_COMMAND_VALUE 32774
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 146
#define _APS_NEXT_SYMED_VALUE 147
#endif
#endif

1
src/BoE.vsproj/Installer/Installer.vcxproj
View File

@@ -53,6 +53,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<None Include="data.nsi" />
<None Include="fileassoc.nsh" />
<None Include="gen-data.py">
<FileType>Script</FileType>
</None>

3
src/BoE.vsproj/Installer/Installer.vcxproj.filters
View File

@@ -17,5 +17,8 @@
<Filter>Source Files</Filter>
</None>
<None Include="Makefile.mak" />
<None Include="fileassoc.nsh">
<Filter>Source Files</Filter>
</None>
</ItemGroup>
</Project>

3
src/BoE.vsproj/Installer/main.nsi
View File

@@ -147,6 +147,7 @@ Section Uninstall
!insertmacro APP_UNASSOCIATE "exg" "BladesOfExile.SaveGame"
!insertmacro APP_UNASSOCIATE "boes" "BladesOfExile.Scenario"
!insertmacro APP_UNASSOCIATE "exs" "BladesOfExile.OldScenario"
!insertmacro UPDATEFILEASSOC
; Delete self
@@ -168,7 +169,7 @@ Section Uninstall
Delete "$INSTDIR\sfml-system-2.dll"
Delete "$INSTDIR\sfml-window-2.dll"
Delete "$INSTDIR\zlib1.dll"
Delete "$INSTDIR\openal.dll"
Delete "$INSTDIR\openal32.dll"
RMDir /r "$INSTDIR\data"
RMDir /r "$INSTDIR\Scenario Editor\graphics.exd"
RMDir /r "$INSTDIR\Scenario Editor\sounds.exa"