diff --git a/.gitignore b/.gitignore index 0d0674f..c64d65b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ Prospero_Debug/ Assets/StreamingAssets/ BuildPS5/ BuildXB1/ +BuildXSX/ diff --git a/Assets/Scripts/UniQuake.cs b/Assets/Scripts/UniQuake.cs index 0944f5f..15cdbaf 100644 --- a/Assets/Scripts/UniQuake.cs +++ b/Assets/Scripts/UniQuake.cs @@ -5,8 +5,8 @@ using UnityEngine; public partial class UniQuake: MonoBehaviour { -#if UNITY_GAMECORE_XBOXONE - private const int DefaultMemSize = 0x2000000; // Xbox One is limited to 32 MB of heap space for now... +#if UNITY_GAMECORE + private const int DefaultMemSize = 0x2000000; // Xbox is limited to 32 MB of heap space for now... #else private const int DefaultMemSize = 0x8000000; // 128 MB of heap space #endif diff --git a/engine/Windows/VisualStudio/uniquake.sln b/engine/Windows/VisualStudio/uniquake.sln index b14c283..ffec704 100644 --- a/engine/Windows/VisualStudio/uniquake.sln +++ b/engine/Windows/VisualStudio/uniquake.sln @@ -7,16 +7,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uniquake", "uniquake.vcxpro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Portable|Gaming.Xbox.Scarlett.x64 = Debug Portable|Gaming.Xbox.Scarlett.x64 Debug Portable|Gaming.Xbox.XboxOne.x64 = Debug Portable|Gaming.Xbox.XboxOne.x64 Debug Portable|ORBIS = Debug Portable|ORBIS Debug Portable|Prospero = Debug Portable|Prospero Debug Portable|x64 = Debug Portable|x64 Debug Portable|x86 = Debug Portable|x86 + Debug|Gaming.Xbox.Scarlett.x64 = Debug|Gaming.Xbox.Scarlett.x64 Debug|Gaming.Xbox.XboxOne.x64 = Debug|Gaming.Xbox.XboxOne.x64 Debug|ORBIS = Debug|ORBIS Debug|Prospero = Debug|Prospero Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Gaming.Xbox.Scarlett.x64 = Release|Gaming.Xbox.Scarlett.x64 Release|Gaming.Xbox.XboxOne.x64 = Release|Gaming.Xbox.XboxOne.x64 Release|ORBIS = Release|ORBIS Release|Prospero = Release|Prospero @@ -24,6 +27,8 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug Portable|Gaming.Xbox.Scarlett.x64 + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|Gaming.Xbox.Scarlett.x64.Build.0 = Debug Portable|Gaming.Xbox.Scarlett.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug Portable|Gaming.Xbox.XboxOne.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|Gaming.Xbox.XboxOne.x64.Build.0 = Debug Portable|Gaming.Xbox.XboxOne.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|ORBIS.ActiveCfg = Debug Portable|ORBIS @@ -34,6 +39,8 @@ Global {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|x64.Build.0 = Debug Portable|x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|x86.ActiveCfg = Debug Portable|Win32 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|x86.Build.0 = Debug Portable|Win32 + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug|Gaming.Xbox.Scarlett.x64 + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|Gaming.Xbox.Scarlett.x64.Build.0 = Debug|Gaming.Xbox.Scarlett.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug|Gaming.Xbox.XboxOne.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|Gaming.Xbox.XboxOne.x64.Build.0 = Debug|Gaming.Xbox.XboxOne.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|ORBIS.ActiveCfg = Debug|ORBIS @@ -44,6 +51,9 @@ Global {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|x64.Build.0 = Debug|x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|x86.ActiveCfg = Debug|Win32 {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|x86.Build.0 = Debug|Win32 + {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Gaming.Xbox.Scarlett.x64.ActiveCfg = Release|Gaming.Xbox.Scarlett.x64 + {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64 + {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Gaming.Xbox.Scarlett.x64.Deploy.0 = Release|Gaming.Xbox.Scarlett.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Gaming.Xbox.XboxOne.x64.Deploy.0 = Release|Gaming.Xbox.XboxOne.x64 diff --git a/engine/Windows/VisualStudio/uniquake.vcxproj b/engine/Windows/VisualStudio/uniquake.vcxproj index 9048384..613ed34 100644 --- a/engine/Windows/VisualStudio/uniquake.vcxproj +++ b/engine/Windows/VisualStudio/uniquake.vcxproj @@ -1,6 +1,10 @@ + + Debug Portable + Gaming.Xbox.Scarlett.x64 + Debug Portable Gaming.Xbox.XboxOne.x64 @@ -21,6 +25,10 @@ Debug Portable x64 + + Debug + Gaming.Xbox.Scarlett.x64 + Debug Gaming.Xbox.XboxOne.x64 @@ -41,6 +49,10 @@ Debug x64 + + Release + Gaming.Xbox.Scarlett.x64 + Release Gaming.Xbox.XboxOne.x64 @@ -96,6 +108,12 @@ NotSet true + + Application + v141 + NotSet + true + Application v141 @@ -118,6 +136,11 @@ v141 NotSet + + DynamicLibrary + v141 + NotSet + DynamicLibrary v141 @@ -138,6 +161,11 @@ v141 NotSet + + DynamicLibrary + v141 + NotSet + DynamicLibrary v141 @@ -166,6 +194,9 @@ + + + @@ -178,6 +209,9 @@ + + + @@ -190,6 +224,9 @@ + + + @@ -225,6 +262,11 @@ Build-$(ProjectName)\$(Platform)\$(Configuration)\ true + + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ + Build-$(ProjectName)\$(Platform)\$(Configuration)\ + true + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ Build-$(ProjectName)\$(Platform)\$(Configuration)\ @@ -245,6 +287,11 @@ Build-$(ProjectName)\$(Platform)\$(Configuration)\ true + + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ + Build-$(ProjectName)\$(Platform)\$(Configuration)\ + true + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ Build-$(ProjectName)\$(Platform)\$(Configuration)\ @@ -265,6 +312,11 @@ Build-$(ProjectName)\$(Platform)\$(Configuration)\ false + + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ + Build-$(ProjectName)\$(Platform)\$(Configuration)\ + false + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ Build-$(ProjectName)\$(Platform)\$(Configuration)\ @@ -407,6 +459,32 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)" copy $(TargetDir)$(TargetName).dll $(SolutionDir)..\..\..\Assets\Plugins\windows\x86_64\uniquake.dll + + + + Disabled + ..\SDL2\include;..\..\FMOD\inc;..\..\Quake;%(AdditionalIncludeDirectories) + UNIQUAKE_EXPORTS;USE_LIBSDL;USE_OPENGL;WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_FMOD;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;opengl32.lib;winmm.lib;SDL2.lib;SDL2main.lib;fmodL_vc.lib;%(AdditionalDependencies) + ..\..\FMOD\lib\x64;..\SDL2\lib64;%(AdditionalLibraryDirectories) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + + + copy $(TargetDir)$(TargetName).dll $(SolutionDir)..\..\..\Assets\Plugins\windows\x86_64\uniquake.dll + + @@ -513,6 +591,31 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)" copy "$(TargetDir)$(TargetName).pdb" $(SolutionDir)..\..\..\Assets\Plugins\gamecore\xboxone\uniquake.pdb + + + + Disabled + ..\..\UniQuake\stub;..\..\FMOD\inc;..\..\Quake;%(AdditionalIncludeDirectories) + UNIQUAKE_EXPORTS;_DEBUG;USE_FMOD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Level3 + ProgramDatabase + CompileAsC + + + fmodL.lib;user32.lib;shell32.lib;kernel32.lib;$(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + ..\..\FMOD\lib\scarlett;%(AdditionalLibraryDirectories) + true + Windows + + + copy "$(TargetDir)$(TargetName).dll" $(SolutionDir)..\..\..\Assets\Plugins\gamecore\scarlett\uniquake.dll +copy "$(TargetDir)$(TargetName).pdb" $(SolutionDir)..\..\..\Assets\Plugins\gamecore\scarlett\uniquake.pdb + + @@ -622,6 +725,34 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" copy "$(SolutionDir)\..\codecs\x64\*.dll" "$(TargetDir)" +copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" + + + + + + MaxSpeed + true + ..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + CompileAsC + + + libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libmikmod.lib;ws2_32.lib;opengl32.lib;winmm.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies) + ..\codecs\x64;..\SDL2\lib64;%(AdditionalLibraryDirectories) + true + Windows + true + true + + + copy "$(SolutionDir)\..\codecs\x64\*.dll" "$(TargetDir)" copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)"