Fix missing NDEBUG flags

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" />

GpApp/Link.cpp

@@ -244,12 +244,13 @@ void OpenLinkWindow (void)
 		basicState.m_text.Set(4, "Link");
 		basicState.m_window = linkWindow;
 
-		linkControl = PortabilityLayer::ButtonWidget::Create(basicState, nullptr);
+		PortabilityLayer::ButtonWidget::AdditionalData addlData;
+		linkControl = PortabilityLayer::ButtonWidget::Create(basicState, &addlData);
 
 		basicState.m_rect = Rect::Create(5, 5, 25, 59);
 		basicState.m_text.Set(6, "Unlink");
 		basicState.m_window = linkWindow;
-		unlinkControl = PortabilityLayer::ButtonWidget::Create(basicState, nullptr);
+		unlinkControl = PortabilityLayer::ButtonWidget::Create(basicState, &addlData);
 
 		linkWindow->DrawControls();
 		

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;

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 />

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;

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 />

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 />

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

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;
 	}
 

gpr2gpa/gpr2gpa.cpp

@@ -1342,10 +1342,10 @@ int ConvertDirectory(const std::string &basePath, const PortabilityLayer::Combin
 
 int PrintUsage()
 {
-	fprintf(stderr, "Usage: gpr2gpa <input.gpr> <input.ts> <output.gpa> [patch.json]");
-	fprintf(stderr, "       gpr2gpa <input dir>\* <input.ts>");
-	fprintf(stderr, "       gpr2gpa <input dir>/* <input.ts>");
-	fprintf(stderr, "       gpr2gpa * <input.ts>");
+	fprintf(stderr, "Usage: gpr2gpa <input.gpr> <input.ts> <output.gpa> [patch.json]\n");
+	fprintf(stderr, "       gpr2gpa <input dir>\* <input.ts>\n");
+	fprintf(stderr, "       gpr2gpa <input dir>/* <input.ts>\n");
+	fprintf(stderr, "       gpr2gpa * <input.ts>\n");
 	return -1;
 }