WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 23:00:42 +00:00
Code Issues Projects Releases Wiki Activity

Remove Resources dir from Windows release

Browse Source
This commit is contained in:
elasota
2021-04-07 10:52:18 -04:00
parent 93195207dc
commit 7842e721e5
4 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Aerofoil/GpFileSystem_Win32.cpp
View File

@@ -158,7 +158,7 @@ GpFileSystem_Win32::GpFileSystem_Win32()
continue; continue;
} }
if (wcscat_s(m_executablePath, L"Resources")) if (wcscat_s(m_executablePath, L"Packaged"))
{ {
currentPathLength = 0; currentPathLength = 0;
break; break;
@@ -177,7 +177,6 @@ GpFileSystem_Win32::GpFileSystem_Win32()
{ {
m_packagedDir = std::wstring(m_executablePath) + L"Packaged\\"; m_packagedDir = std::wstring(m_executablePath) + L"Packaged\\";
m_housesDir = std::wstring(m_executablePath) + L"Packaged\\Houses\\"; m_housesDir = std::wstring(m_executablePath) + L"Packaged\\Houses\\";
m_resourcesDir = std::wstring(m_executablePath) + L"Resources\\";
} }
} }

2
MakeRelease.bat
View File

@@ -29,9 +29,7 @@ mkdir ReleasePkg\PDBs
copy /Y x64\Release\Aerofoil.pdb ReleasePkg\PDBs copy /Y x64\Release\Aerofoil.pdb ReleasePkg\PDBs
copy /Y x64\Release\GpAudioDriver_XAudio2.pdb ReleasePkg\PDBs copy /Y x64\Release\GpAudioDriver_XAudio2.pdb ReleasePkg\PDBs
copy /Y x64\Release\GpDisplayDriver_D3D11.pdb ReleasePkg\PDBs copy /Y x64\Release\GpDisplayDriver_D3D11.pdb ReleasePkg\PDBs
copy /Y x64\Release\GpFontHandler_FreeType2.pdb ReleasePkg\PDBs
copy /Y x64\Release\GpInputDriver_XInput.pdb ReleasePkg\PDBs copy /Y x64\Release\GpInputDriver_XInput.pdb ReleasePkg\PDBs
copy /Y x64\Release\FreeType.pdb ReleasePkg\PDBs
copy /Y x64\Release\GpApp.pdb ReleasePkg\PDBs copy /Y x64\Release\GpApp.pdb ReleasePkg\PDBs
copy /Y x64\Release\flattenmov.pdb ReleasePkg\PDBs copy /Y x64\Release\flattenmov.pdb ReleasePkg\PDBs

10
ReleasePackageInstaller/Product.wxs
View File

@@ -56,9 +56,6 @@
<Component Id="Aerofoil.exe" Guid="*"> <Component Id="Aerofoil.exe" Guid="*">
<File Id="Aerofoil.exe" Source="$(var.Aerofoil.TargetPath)" KeyPath="yes" Checksum="yes" /> <File Id="Aerofoil.exe" Source="$(var.Aerofoil.TargetPath)" KeyPath="yes" Checksum="yes" />
</Component> </Component>
<Component Id="FreeType.dll" Guid="*">
<File Id="FreeType.dll" Source="$(var.FreeType.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="GpApp.dll" Guid="*"> <Component Id="GpApp.dll" Guid="*">
<File Id="GpApp.dll" Source="$(var.GpApp.TargetPath)" KeyPath="yes" Checksum="yes"/> <File Id="GpApp.dll" Source="$(var.GpApp.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
@@ -74,9 +71,6 @@
<Component Id="GpInputDriver_XInput.dll" Guid="*"> <Component Id="GpInputDriver_XInput.dll" Guid="*">
<File Id="GpInputDriver_XInput.dll" Source="$(var.GpInputDriver_XInput.TargetPath)" KeyPath="yes" Checksum="yes"/> <File Id="GpInputDriver_XInput.dll" Source="$(var.GpInputDriver_XInput.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="GpFontHandler_FreeType2.dll" Guid="*">
<File Id="GpFontHandler_FreeType2.dll" Source="$(var.GpFontHandler_FreeType2.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="AEROFOILPACKAGEDDIR"> <DirectoryRef Id="AEROFOILPACKAGEDDIR">
@@ -155,21 +149,19 @@
<Feature Id="AerofoilApplicationFeature" Title="Glider PRO Game Data" Level="1" Display="expand" ConfigurableDirectory="AEROFOILPRODUCTDIR" Description="!(loc.AerofoilApplicationFeatureDescription)"> <Feature Id="AerofoilApplicationFeature" Title="Glider PRO Game Data" Level="1" Display="expand" ConfigurableDirectory="AEROFOILPRODUCTDIR" Description="!(loc.AerofoilApplicationFeatureDescription)">
<ComponentRef Id="Aerofoil.exe" /> <ComponentRef Id="Aerofoil.exe" />
<ComponentRef Id="FreeType.dll" />
<ComponentRef Id="GpApp.dll" /> <ComponentRef Id="GpApp.dll" />
<ComponentRef Id="GpAudioDriver_XAudio2.dll" /> <ComponentRef Id="GpAudioDriver_XAudio2.dll" />
<ComponentRef Id="xaudio2_9redist.dll" /> <ComponentRef Id="xaudio2_9redist.dll" />
<ComponentRef Id="GpDisplayDriver_D3D11.dll" /> <ComponentRef Id="GpDisplayDriver_D3D11.dll" />
<ComponentRef Id="GpInputDriver_XInput.dll" /> <ComponentRef Id="GpInputDriver_XInput.dll" />
<ComponentRef Id="GpFontHandler_FreeType2.dll" />
<ComponentRef Id="ApplicationResources" /> <ComponentRef Id="ApplicationResources" />
<ComponentRef Id="Fonts" />
<ComponentRef Id="readme.txt" /> <ComponentRef Id="readme.txt" />
<ComponentGroupRef Id="DefaultHousesComponentGroup"/> <ComponentGroupRef Id="DefaultHousesComponentGroup"/>
<ComponentGroupRef Id="ResourcesComponentGroup"/>
<ComponentGroupRef Id="LooseDocumentationComponentGroup"/> <ComponentGroupRef Id="LooseDocumentationComponentGroup"/>
<ComponentRef Id="StartMenuShortcuts" /> <ComponentRef Id="StartMenuShortcuts" />

10
ReleasePackageInstaller/ReleasePackageInstaller.wixproj
View File

@@ -176,7 +176,6 @@
</Target> </Target>
<PropertyGroup> <PropertyGroup>
<DefineConstants> <DefineConstants>
ResourcesDataDir=$(SolutionDir)\Resources;
DocumentationDataDir=$(SolutionDir)\Documentation; DocumentationDataDir=$(SolutionDir)\Documentation;
HousesDataDir=$(SolutionDir)\Packaged\Houses; HousesDataDir=$(SolutionDir)\Packaged\Houses;
PackagedDataDir=$(SolutionDir)\Packaged; PackagedDataDir=$(SolutionDir)\Packaged;
@@ -184,15 +183,6 @@ PackagedDataDir=$(SolutionDir)\Packaged;
</PropertyGroup> </PropertyGroup>
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
<ItemGroup> <ItemGroup>
<HarvestDirectory Include="$(SolutionDir)\Resources">
<DirectoryRefId>AEROFOILRESOURCESDIR</DirectoryRefId>
<SuppressRootDirectory>true</SuppressRootDirectory>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
<ComponentGroupName>ResourcesComponentGroup</ComponentGroupName>
<AutogenerateGuids>true</AutogenerateGuids>
<PreprocessorVariable>var.ResourcesDataDir</PreprocessorVariable>
</HarvestDirectory>
<HarvestDirectory Include="$(SolutionDir)\InstallerPackages\DefaultHouses"> <HarvestDirectory Include="$(SolutionDir)\InstallerPackages\DefaultHouses">
<DirectoryRefId>AEROFOILHOUSESDIR</DirectoryRefId> <DirectoryRefId>AEROFOILHOUSESDIR</DirectoryRefId>
<SuppressRootDirectory>true</SuppressRootDirectory> <SuppressRootDirectory>true</SuppressRootDirectory>