Fix missing NDEBUG flags

Add PDB directory to release script
Fix comment typo
2025-09-23 06:53:43 +00:00 · 2020-05-29 01:45:40 -04:00 · 2020-05-29 00:00:11 -04:00 · 2020-05-28 23:10:30 -04:00 · 2020-05-28 23:05:32 -04:00
8 changed files with 30 additions and 4 deletions
--- a/GpApp/GpApp.vcxproj
+++ b/GpApp/GpApp.vcxproj
@@ -69,6 +69,7 @@
    <Import Project="GpApp.props" />
    <Import Project="..\Common.props" />
    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
--- a/GpApp/Music.cpp
+++ b/GpApp/Music.cpp
@@ -134,7 +134,7 @@ void ToggleMusicWhilePlaying (void)

 void SetMusicalMode (short newMode)
 {	
-	if (dontLoadMusic)
+	if (dontLoadMusic || failedMusic)
 		return;

 	musicMutex->Lock();
@@ -302,6 +302,12 @@ void InitMusic (void)
 		return;
 	}
 	theErr = OpenMusicChannel();
+	if (theErr != PLErrors::kNone)
+	{
+		YellowAlert(kYellowNoMusic, theErr);
+		failedMusic = true;
+		return;
+	}
 	
 	musicScore[0] = 0;
 	musicScore[1] = 1;
--- a/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj
+++ b/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj
@@ -63,6 +63,7 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -71,6 +72,7 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
--- a/GpDisplayDriver_D3D11/GpDisplayDriverD3D11.cpp
+++ b/GpDisplayDriver_D3D11/GpDisplayDriverD3D11.cpp
@@ -1239,7 +1239,7 @@ void GpDisplayDriverD3D11::SetBackgroundColor(uint8_t r, uint8_t g, uint8_t b, u

 void GpDisplayDriverD3D11::RequestToggleFullScreen(uint32_t timestamp)
 {
-	// Alt-Enter gets re-sent after a full-screen toggle, so we ignore toggle requests until half a second has  seconds have elapsed
+	// Alt-Enter gets re-sent after a full-screen toggle, so we ignore toggle requests until half a second has elapsed
 	if (timestamp > m_lastFullScreenToggleTimeStamp + 30)
 	{
 		m_isFullScreenDesired = !m_isFullScreenDesired;
--- a/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj
+++ b/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj
@@ -65,6 +65,7 @@
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\GpCommon.props" />
    <Import Project="..\Common.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -75,6 +76,7 @@
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\GpCommon.props" />
    <Import Project="..\Common.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
--- a/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj
+++ b/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj
@@ -63,6 +63,7 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -71,6 +72,7 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\GpCommon.props" />
+    <Import Project="..\Release.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
--- a/MakeRelease.bat
+++ b/MakeRelease.bat
@@ -1,5 +1,7 @@
 rmdir /S /Q ReleasePkg

+mkdir ReleasePkg\PDBs
+
 mkdir ReleasePkg\Aerofoil
 mkdir ReleasePkg\Aerofoil\Packaged
 mkdir ReleasePkg\Aerofoil\Resources
@@ -21,6 +23,9 @@ copy /Y x64\Release\FTagData.exe ReleasePkg\Aerofoil\Tools
 copy /Y x64\Release\gpr2gpa.exe ReleasePkg\Aerofoil\Tools
 copy /Y x64\Release\unpacktool.exe ReleasePkg\Aerofoil\Tools

+
+copy /Y x64\Release\*.pdb ReleasePkg\PDBs
+
 xcopy /I /E /Y /K Packaged ReleasePkg\Aerofoil\Packaged
 xcopy /I /E /Y /K Resources ReleasePkg\Aerofoil\Resources
 xcopy /I /E /Y /K Documentation ReleasePkg\Aerofoil\Documentation
--- a/PortabilityLayer/PLSound.cpp
+++ b/PortabilityLayer/PLSound.cpp
@@ -353,12 +353,15 @@ namespace PortabilityLayer

 	AudioChannel *SoundSystemImpl::CreateChannel()
 	{
+		IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance();
+		if (!audioDriver)
+			return nullptr;
+
 		PortabilityLayer::MemoryManager *mm = PortabilityLayer::MemoryManager::GetInstance();
 		void *storage = mm->Alloc(sizeof(PortabilityLayer::AudioChannelImpl));
 		if (!storage)
 			return nullptr;

-		IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance();
 		IGpAudioChannel *audioChannel = audioDriver->CreateChannel();
 		if (!audioChannel)
 		{
@@ -388,7 +391,12 @@ namespace PortabilityLayer

 	void SoundSystemImpl::SetVolume(uint8_t vol)
 	{
-		PortabilityLayer::HostAudioDriver::GetInstance()->SetMasterVolume(vol, 255);
+		IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance();
+
+		if (!audioDriver)
+			return;
+
+		audioDriver->SetMasterVolume(vol, 255);
 		m_volume = vol;
 	}
Author	SHA1	Message	Date
elasota	98afd82d64	Fix missing NDEBUG flags	2020-05-29 01:45:40 -04:00
elasota	efae9cacd8	Add PDB directory to release script	2020-05-29 00:00:11 -04:00
elasota	5184d1594f	Fix comment typo	2020-05-28 23:10:30 -04:00
elasota	42e124a90c	Fix crash if audio init fails (especially if there are no output devices)	2020-05-28 23:05:32 -04:00