diff --git a/Aerofoil/GpFileSystem_Win32.cpp b/Aerofoil/GpFileSystem_Win32.cpp
index 9f1db51..5cdb345 100644
--- a/Aerofoil/GpFileSystem_Win32.cpp
+++ b/Aerofoil/GpFileSystem_Win32.cpp
@@ -158,7 +158,7 @@ GpFileSystem_Win32::GpFileSystem_Win32()
continue;
}
- if (wcscat_s(m_executablePath, L"Resources"))
+ if (wcscat_s(m_executablePath, L"Packaged"))
{
currentPathLength = 0;
break;
@@ -177,7 +177,6 @@ GpFileSystem_Win32::GpFileSystem_Win32()
{
m_packagedDir = std::wstring(m_executablePath) + L"Packaged\\";
m_housesDir = std::wstring(m_executablePath) + L"Packaged\\Houses\\";
- m_resourcesDir = std::wstring(m_executablePath) + L"Resources\\";
}
}
diff --git a/MakeRelease.bat b/MakeRelease.bat
index 3cb6d85..b168650 100644
--- a/MakeRelease.bat
+++ b/MakeRelease.bat
@@ -29,9 +29,7 @@ mkdir ReleasePkg\PDBs
copy /Y x64\Release\Aerofoil.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\GpFontHandler_FreeType2.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\flattenmov.pdb ReleasePkg\PDBs
diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index 8d7a1fb..c97cfad 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -56,9 +56,6 @@
-
-
-
@@ -74,9 +71,6 @@
-
-
-
@@ -155,21 +149,19 @@
-
-
+
-
-
+
diff --git a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
index cae9376..f88e136 100644
--- a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
+++ b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
@@ -176,7 +176,6 @@
-ResourcesDataDir=$(SolutionDir)\Resources;
DocumentationDataDir=$(SolutionDir)\Documentation;
HousesDataDir=$(SolutionDir)\Packaged\Houses;
PackagedDataDir=$(SolutionDir)\Packaged;
@@ -184,15 +183,6 @@ PackagedDataDir=$(SolutionDir)\Packaged;
-
- AEROFOILRESOURCESDIR
- true
- true
- true
- ResourcesComponentGroup
- true
- var.ResourcesDataDir
-
AEROFOILHOUSESDIR
true