From 6472eb74d61eec281125744681d3687889138ae1 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Wed, 21 Jul 2021 11:12:26 +0200 Subject: [PATCH] Updated engine project with PS5 (Prospero) build settings --- engine/Quake/arch_def.h | 6 + engine/Quake/host_cmd.c | 2 +- engine/Quake/net_sys.h | 2 +- engine/Windows/VisualStudio/uniquake.sln | 9 ++ engine/Windows/VisualStudio/uniquake.vcxproj | 133 +++++++++++++++++++ 5 files changed, 150 insertions(+), 2 deletions(-) diff --git a/engine/Quake/arch_def.h b/engine/Quake/arch_def.h index 3ae79af..4fc332a 100644 --- a/engine/Quake/arch_def.h +++ b/engine/Quake/arch_def.h @@ -78,6 +78,12 @@ # define PLATFORM_ORBIS 1 # endif +#elif defined(__PROSPERO__) + +# if !defined(PLATFORM_PROSPERO) +# define PLATFORM_PROSPERO 1 +# endif + #else /* here goes the unix platforms */ #if defined(__unix) || defined(__unix__) || defined(unix) || \ diff --git a/engine/Quake/host_cmd.c b/engine/Quake/host_cmd.c index f0dba67..6b9fff3 100644 --- a/engine/Quake/host_cmd.c +++ b/engine/Quake/host_cmd.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" -#if !defined(_WIN32) && !defined(__ORBIS__) +#if !defined(_WIN32) && !defined(__ORBIS__) && !defined(__PROSPERO__) #include #endif diff --git a/engine/Quake/net_sys.h b/engine/Quake/net_sys.h index 3ac8c4b..581e0d5 100644 --- a/engine/Quake/net_sys.h +++ b/engine/Quake/net_sys.h @@ -175,7 +175,7 @@ COMPILE_TIME_ASSERT(sockaddr, offsetof(struct sockaddr, sa_family) == SA_FAM_OFF #endif /* end of windows stuff */ -#if defined(PLATFORM_ORBIS) +#if defined(PLATFORM_ORBIS) || defined(PLATFORM_PROSPERO) typedef int sys_socket_t; #define INVALID_SOCKET (-1) diff --git a/engine/Windows/VisualStudio/uniquake.sln b/engine/Windows/VisualStudio/uniquake.sln index 616ade4..24f4615 100644 --- a/engine/Windows/VisualStudio/uniquake.sln +++ b/engine/Windows/VisualStudio/uniquake.sln @@ -8,30 +8,39 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution 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|ORBIS = Debug|ORBIS + Debug|Prospero = Debug|Prospero Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|ORBIS = Release|ORBIS + Release|Prospero = Release|Prospero Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|ORBIS.ActiveCfg = Debug Portable|ORBIS {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|ORBIS.Build.0 = Debug Portable|ORBIS + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|Prospero.ActiveCfg = Debug Portable|Prospero + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|Prospero.Build.0 = Debug Portable|Prospero {AE77266F-0A23-4F08-A491-369DE664B273}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 {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|ORBIS.ActiveCfg = Debug|ORBIS {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|ORBIS.Build.0 = Debug|ORBIS + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|Prospero.ActiveCfg = Debug|Prospero + {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|Prospero.Build.0 = Debug|Prospero {AE77266F-0A23-4F08-A491-369DE664B273}.Debug|x64.ActiveCfg = Debug|x64 {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|ORBIS.ActiveCfg = Release|ORBIS {AE77266F-0A23-4F08-A491-369DE664B273}.Release|ORBIS.Build.0 = Release|ORBIS + {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Prospero.ActiveCfg = Release|Prospero + {AE77266F-0A23-4F08-A491-369DE664B273}.Release|Prospero.Build.0 = Release|Prospero {AE77266F-0A23-4F08-A491-369DE664B273}.Release|x64.ActiveCfg = Release|x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Release|x64.Build.0 = Release|x64 {AE77266F-0A23-4F08-A491-369DE664B273}.Release|x86.ActiveCfg = Release|Win32 diff --git a/engine/Windows/VisualStudio/uniquake.vcxproj b/engine/Windows/VisualStudio/uniquake.vcxproj index c3cd4be..a4ff865 100644 --- a/engine/Windows/VisualStudio/uniquake.vcxproj +++ b/engine/Windows/VisualStudio/uniquake.vcxproj @@ -5,6 +5,10 @@ Debug Portable ORBIS + + Debug Portable + Prospero + Debug Portable Win32 @@ -17,6 +21,10 @@ Debug ORBIS + + Debug + Prospero + Debug Win32 @@ -29,6 +37,10 @@ Release ORBIS + + Release + Prospero + Release Win32 @@ -73,6 +85,12 @@ NotSet true + + Application + v141 + NotSet + true + DynamicLibrary v141 @@ -83,6 +101,11 @@ v141 NotSet + + DynamicLibrary + v141 + NotSet + DynamicLibrary v141 @@ -93,6 +116,11 @@ v141 NotSet + + DynamicLibrary + v141 + NotSet + @@ -111,18 +139,27 @@ + + + + + + + + + <_ProjectFileVersion>15.0.28307.799 @@ -152,6 +189,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)\ @@ -162,6 +204,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)\ @@ -172,6 +219,11 @@ Build-$(ProjectName)\$(Platform)\$(Configuration)\ false + + $(SolutionDir)Build-$(ProjectName)\$(Platform)\$(Configuration)\ + Build-$(ProjectName)\$(Platform)\$(Configuration)\ + false + Disabled @@ -304,6 +356,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 + + X64 @@ -360,6 +438,33 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)" copy "$(TargetDir)$(TargetName).prx" $(SolutionDir)..\..\..\Assets\Plugins\orbis\uniquake.prx + + + + Disabled + ..\..\UniQuake\stub;..\..\FMOD\inc;..\..\Quake;%(AdditionalIncludeDirectories) + UNIQUAKE_EXPORTS;_DEBUG;USE_FMOD;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + C11 + + + libScePosix_stub_weak.a;libfmodL_stub_weak.a;%(AdditionalDependencies) + ..\..\FMOD\lib\prospero;%(AdditionalLibraryDirectories) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + + + copy "$(TargetDir)$(TargetName).prx" $(SolutionDir)..\..\..\Assets\Plugins\prospero\uniquake.prx + + X64 @@ -415,6 +520,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)"